MDL-10857 broken link in navlinks for question bank pointing to mod/modname/view...

diff --git a/question/category.php b/question/category.php
index 040f4309e06715f321de1f2562721038e906e086..25e87b64206e71736b72cf4af97eba0e93d1316d 100644 (file)
--- a/question/category.php
+++ b/question/category.php
@@ -75,23 +75,21 @@
     } elseif ((!empty($param->delete) and (!$questionstomove) and confirm_sesskey()))  {
         $qcobject->delete_category($param->delete);//delete the category now no questions to move
     }
-    $crumbs = array();
+    $navlinks = array();
     if ($cm!==null) {
         // Page header
         $strupdatemodule = has_capability('moodle/course:manageactivities', $contexts->lowest())
             ? update_module_button($cm->id, $COURSE->id, get_string('modulename', $cm->modname))
             : "";
-        $navlinks = array();
         $navlinks[] = array('name' => get_string('modulenameplural', $cm->modname),
                             'link' => "$CFG->wwwroot/mod/{$cm->modname}/index.php?id=$COURSE->id",
                             'type' => 'activity');
         $navlinks[] = array('name' => format_string($module->name),
-                            'link' => "$CFG->wwwroot/mod/{$cm->modname}/view.php?cmid={$cm->id}",
+                            'link' => "$CFG->wwwroot/mod/{$cm->modname}/view.php?id={$cm->id}",
                             'type' => 'title');
     } else {
         // Print basic page layout.
         $strupdatemodule = '';
-        $navlinks = array();
     }
 
     if (!$param->edit){

diff --git a/question/edit.php b/question/edit.php
index 96c481541d243a581f756c71ad9ed2e3b169f6a7..ab82c42fdcd4d3e7ffe426405db755772e7a200f 100644 (file)
--- a/question/edit.php
+++ b/question/edit.php
@@ -26,7 +26,7 @@
             : "";
         $navlinks = array();
         $navlinks[] = array('name' => get_string('modulenameplural', $cm->modname), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/index.php?id=$COURSE->id", 'type' => 'activity');
-        $navlinks[] = array('name' => format_string($module->name), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/view.php?cmid={$cm->id}", 'type' => 'title');
+        $navlinks[] = array('name' => format_string($module->name), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/view.php?id={$cm->id}", 'type' => 'title');
         $navlinks[] = array('name' => $streditingquestions, 'link' => '', 'type' => 'title');
         $navigation = build_navigation($navlinks);
         print_header_simple($streditingquestions, '', $navigation, "", "", true, $strupdatemodule);

diff --git a/question/export.php b/question/export.php
index 10095a68356dc74bd12c866c300cd6ce3c356ae6..4e40dc47a5366c2f8a8b3bbb7f12141a994d66cf 100644 (file)
--- a/question/export.php
+++ b/question/export.php
@@ -51,7 +51,7 @@
             : "";
         $navlinks = array();
         $navlinks[] = array('name' => get_string('modulenameplural', $cm->modname), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/index.php?id=$COURSE->id", 'type' => 'activity');
-        $navlinks[] = array('name' => format_string($module->name), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/view.php?cmid={$cm->id}", 'type' => 'title');
+        $navlinks[] = array('name' => format_string($module->name), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/view.php?id={$cm->id}", 'type' => 'title');
         $navlinks[] = array('name' => $txt->exportquestions, 'link' => '', 'type' => 'title');
         $navigation = build_navigation($navlinks);
         print_header_simple($txt->exportquestions, '', $navigation, "", "", true, $strupdatemodule);

diff --git a/question/import.php b/question/import.php
index 8a1ec932ce4f0633056849e2ae9b237f4a1eb63e..ee11b55dee37e7ff714a11fcc3e6a03c501aa347 100644 (file)
--- a/question/import.php
+++ b/question/import.php
@@ -60,7 +60,7 @@
             : "";
         $navlinks = array();
         $navlinks[] = array('name' => get_string('modulenameplural', $cm->modname), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/index.php?id=$COURSE->id", 'type' => 'activity');
-        $navlinks[] = array('name' => format_string($module->name), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/view.php?cmid={$cm->id}", 'type' => 'title');
+        $navlinks[] = array('name' => format_string($module->name), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/view.php?id={$cm->id}", 'type' => 'title');
         $navlinks[] = array('name' => $txt->importquestions, 'link' => '', 'type' => 'title');
         $navigation = build_navigation($navlinks);
         print_header_simple($txt->importquestions, '', $navigation, "", "", true, $strupdatemodule);

diff --git a/question/question.php b/question/question.php
index f272fc22241017a65cab474fc5ec2c9934bd67be..522d021abc524e24097b2961f78c8f50ce754d73 100644 (file)
--- a/question/question.php
+++ b/question/question.php
@@ -203,7 +203,7 @@ if ($mform->is_cancelled()){
             : "";
         $navlinks = array();
         $navlinks[] = array('name' => get_string('modulenameplural', $cm->modname), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/index.php?id=$cm->course", 'type' => 'activity');
-        $navlinks[] = array('name' => format_string($module->name), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/view.php?cmid={$cm->id}", 'type' => 'title');
+        $navlinks[] = array('name' => format_string($module->name), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/view.php?id={$cm->id}", 'type' => 'title');
         $navlinks[] = array('name' => get_string('editingquiz', 'quiz'), 'link' => $returnurl, 'type' => 'title');
         $navlinks[] = array('name' => $streditingquestion, 'link' => '', 'type' => 'title');
         $navigation = build_navigation($navlinks);