question MDL-19820 Added set_url calls with pre-generated var

diff --git a/question/addquestion.php b/question/addquestion.php
index 7e460bda34d6eb565c28a11340991a15da6d0aa8..266416d095db2068e7deac07befa2fe390221e70 100644 (file)
--- a/question/addquestion.php
+++ b/question/addquestion.php
@@ -76,6 +76,8 @@ if (!empty($appendqnumstring)) {
     $hiddenparams['appendqnumstring'] = $appendqnumstring;
 }
 
+$PAGE->set_url(new moodle_url($CFG->wwwroot.'/question/addquestion.php', $hiddenparams));
+
 $chooseqtype = get_string('chooseqtypetoadd', 'question');
 if ($cm !== null) {
     if (stripos($returnurl, "$CFG->wwwroot/mod/{$cm->modname}/view.php")!== 0) {
@@ -87,7 +89,7 @@ if ($cm !== null) {
     $PAGE->set_button($OUTPUT->update_module_button($cm->id, $cm->modname));
     echo $OUTPUT->header();
 } else {
-    $PAGE->navbar->add(get_string('editquestions', 'question'),$returnurl);
+    $PAGE->navbar->add(get_string('questionbank', 'question'),$returnurl);
     $PAGE->navbar->add($chooseqtype);
     $PAGE->set_title($chooseqtype);
     echo $OUTPUT->header();

diff --git a/question/contextmove.php b/question/contextmove.php
index 9a54b859d6f5ee254dc93f9ba589059b389e5f35..c8526415c32068b18659e8cf2784d63f153a93e3 100644 (file)
--- a/question/contextmove.php
+++ b/question/contextmove.php
@@ -199,6 +199,7 @@
         $strupdatemodule = '';
     }
 
+    $PAGE->set_url($thispageurl->out());
     $PAGE->navbar->add($streditingcategories, $thispageurl->out());
     $PAGE->navbar->add(get_string('movingcategory', 'question'));
     $PAGE->set_title($streditingcategories);

diff --git a/question/contextmoveq.php b/question/contextmoveq.php
index 095247b6ea84a0828a515499b9b8e055a4ab3870..277d6be47b97e93193d1b586246e5e5edf5f3a41 100644 (file)
--- a/question/contextmoveq.php
+++ b/question/contextmoveq.php
@@ -182,6 +182,7 @@ if ($cmid) {
     $strupdatemodule = '';
 }
 $strmovingquestions = get_string('movingquestions', 'question');
+$PAGE->set_url($thispageurl->out());
 $PAGE->navbar->add($strmovingquestions);
 $PAGE->set_title($strmovingquestions);
 $PAGE->set_button($strupdatemodule);

diff --git a/question/export.php b/question/export.php
index 0cfac92e676b8e532c8cb2cad305d965426ca470..cb389cb89ee865f92712dc15a60849ec145a638c 100644 (file)
--- a/question/export.php
+++ b/question/export.php
@@ -32,6 +32,7 @@
     }
 
     /// Header
+    $PAGE->set_url($thispageurl->out());
     $PAGE->set_title($strexportquestions);
     if ($cm!==null) {
         $strupdatemodule = has_capability('moodle/course:manageactivities', $contexts->lowest())

diff --git a/question/import.php b/question/import.php
index 31a893f9411494d3cf5151842af64809c782078c..d4913fc8b3a1f9763a42c98a8730074bdb92f703 100644 (file)
--- a/question/import.php
+++ b/question/import.php
@@ -44,6 +44,8 @@
     // ensure the files area exists for this course
     make_upload_directory("$COURSE->id");
 
+    $PAGE->set_url($thispageurl->out());
+
     $import_form = new question_import_form($thispageurl, array('contexts'=>$contexts->having_one_edit_tab_cap('import'),
                                                         'defaultcategory'=>$pagevars['cat']));