quiz editing: MDL-17284 fix infinite redirect bug.

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 4b91178349f77bfe5cca469d32a2f5c85b5d003b..3a87d7000c74ca7c50d3297de0cb28ba8b5d10d2 100644 (file)
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -62,7 +62,7 @@ function module_specific_actions($pageurl, $questionid, $cmid, $canuse, $cmoptio
  * (which is called from showbank())
  * Displays button in form with checkboxes for each question.
  */
-function module_specific_buttons($cmid,$cmoptions){
+function module_specific_buttons($cmid, $cmoptions){
     if($cmoptions->hasattempts){
         $disabled='disabled="disabled"';
     }else{
@@ -540,7 +540,7 @@ if ($significantchangemade) {
         }
     }
     quiz_update_sumgrades($quiz);
-    redirect($qcobject->pageurl->out());
+    redirect($thispageurl->out());
 }
 
 question_showbank_actions($thispageurl, $cm);

diff --git a/question/editlib.php b/question/editlib.php
index 60afa8e56c90c2cbeed69020ed11fe83984d7587..006e92d300d1c5078e988b6b8c4f6ea6ba0ada36 100644 (file)
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -604,6 +604,8 @@ function question_edit_setup($edittab, $requirecmid = false, $requirecourseid =
     //$thispageurl is used to construct urls for all question edit pages we link to from this page. It contains an array
     //of parameters that are passed from page to page.
     $thispageurl = new moodle_url();
+    $thispageurl->remove_params(); // We are going to explicity add back everything important - this avoids unwanted params from being retained.
+
     if ($requirecmid){
         $cmid =required_param('cmid', PARAM_INT);
     } else {