Avoid $_REQUEST["id"] usage. MDL-14806 ; merged from 19_STABLE

diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index b832e1771b6780915528e294c14fc4e5ba033266..30d97c718dacdf7193a7fe15c9c3b137506919c3 100644 (file)
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -59,8 +59,6 @@
         if (! $cm = get_coursemodule_from_instance("wiki", $wiki->id, $course->id)) {
             print_error("Course Module ID was incorrect");
         }
-        $id = $cm->id;
-        $_REQUEST["id"] = $id;
     }
 
     require_course_login($course, true, $cm);
@@ -74,9 +72,6 @@
     /// Default format:
     $moodle_format=FORMAT_MOODLE;
 
-    ### SAVE ID from Moodle
-    $moodleID=@$_REQUEST["id"];
-
 /// Globally disable CamelCase, if the option is selected for this wiki.
     $moodle_disable_camel_case = ($wiki->disablecamelcase == 1);
     
@@ -141,7 +136,7 @@
 
         /// Build the ewsiki script constant
         /// ewbase will also be needed by EWIKI_SCRIPT_BINARY
-        $ewbase = 'view.php?id='.$moodleID;
+        $ewbase = 'view.php?id='.$cm->id;
         if (isset($userid) && $userid!=0) $ewbase .= '&userid='.$userid;
         if (isset($groupid) && $groupid!=0) $ewbase .= '&groupid='.$groupid;
         $ewscript = $ewbase.'&page=';
@@ -250,9 +245,6 @@
         $content=ewiki_page($page);
         $content2='';
 
-        ### RESTORE ID from Moodle
-        $_REQUEST["id"]=$moodleID;
-        $id=$moodleID;
 ///     ################# EWIKI Part ###########################
     }
     else {
@@ -440,7 +432,7 @@
 <form id='overridelock' method='post' action='overridelock.php'>
   <div>
   <input type='hidden' name='sesskey' value='$sesskey' />
-  <input type='hidden' name='id' value='$id' />
+  <input type='hidden' name='id' value='$cm->id' />
   <input type='hidden' name='page' value='$pageesc' />
   $stroverrideinfo
   <input type='submit' value='$stroverridebutton' />