From 561fe61df30268869a4bf5782d99b7d9ebd0775c Mon Sep 17 00:00:00 2001
From: jamiesensei <jamiesensei>
Date: Mon, 7 May 2007 06:35:33 +0000
Subject: [PATCH] return to the proper page after editing a question in the
 question bank.

---
 question/editlib.php  | 5 ++++-
 question/question.php | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/question/editlib.php b/question/editlib.php
index f6f817bdcd..146a927852 100644
--- 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 35484c3b50..1c8cf70c7c 100644
--- 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 {
-- 
2.39.5