return to the proper page after editing a question in the question bank.

diff --git a/question/editlib.php b/question/editlib.php
index f6f817bdcd03f24ae64191f6e27177a445709c54..146a927852fe263997c0a8a3466898ed7eb73643 100644 (file)
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -321,7 +321,10 @@ function question_list($course, $pageurl, $categoryid, $cm = null,
         
         // edit, hide, delete question, using question capabilities, not quiz capabilieies
         if ($canedit) {
-            echo "<a title=\"$stredit\" href=\"$CFG->wwwroot/question/question.php?id=$question->id\"><img
+            $questionparams = (($cm !== null)? array('cmid' => $cm->id) : array()) +
+                                (array('returnurl' => $pageurl->out(), 'id'=>$question->id));
+            $questionurl = new moodle_url("$CFG->wwwroot/question/question.php", $questionparams);
+            echo "<a title=\"$stredit\" href=\"".$questionurl->out()."\"><img
                     src=\"$CFG->pixpath/t/edit.gif\" alt=\"$stredit\" /></a>&nbsp;";
             // hide-feature
             if($question->hidden) {

diff --git a/question/question.php b/question/question.php
index 35484c3b501c40705b7028bfc543b3c7b144baae..1c8cf70c7c5914c461c8aee0ccaf79778cff987c 100644 (file)
--- a/question/question.php
+++ b/question/question.php
@@ -51,7 +51,6 @@ if (!$category = get_record('question_categories', 'id', $question->category)) {
 }
 if (!$returnurl) {
     $returnurl = "{$CFG->wwwroot}/question/edit.php?courseid={$category->course}";
-    $SESSION->fromurl = $returnurl;
 }
 
 // Validate the question type.
@@ -99,7 +98,7 @@ if ($mform->is_cancelled()){
             notify(get_string('changessaved'), '');
             close_window(3);
         } else {
-            redirect($SESSION->returnurl);
+            redirect($returnurl);
         }
         die;
     } else {