Merged from stable bug 2513

diff --git a/lib/editor/popups/link_std.php b/lib/editor/popups/link_std.php
index cc86767dba0d95b10c0bfdf6ed1f866ff508509b..7818691a84eb08d9604107a3b9eb61130652b639 100644 (file)
--- a/lib/editor/popups/link_std.php
+++ b/lib/editor/popups/link_std.php
@@ -1,11 +1,12 @@
 <?php // $Id$
     include("../../../config.php");
 
-    $id = $_GET['id'];
+    $id = required_param('id');
 
-    require_variable($id);
-
-    if (!$course = get_record("course", "id", $id)) {
+    if ($course = get_record("course", "id", $id)) {
+        $isteacher = isteacher($course->id);
+    } else {
+        $isteacher = false;
         $course->fullname = "";   // Just to keep display happy, though browsing may fail
     }
 ?>
@@ -176,7 +177,10 @@ border-bottom: 1px solid black; letter-spacing: 2px;
 </table>
 
 <div id="buttons">
-  <?php print(isteacher($id))? "<button type=\"button\" name=\"browse\" onclick=\"return onBrowse();\">".get_string("browse","editor")."...</button>" : ""; ?>
+  <?php if ($isteacher) {
+            echo "<button type=\"button\" name=\"browse\" onclick=\"return onBrowse();\">".get_string("browse","editor")."...</button>";
+        }
+  ?>
   <button type="button" name="ok" onclick="return onOK();"><?php print_string("ok","editor");?></button>
   <button type="button" name="cancel" onclick="return onCancel();"><?php print_string("cancel","editor");?></button>
 </div>