MDL-9474: Updated build_navigation() to use global $COURSE

- Removed $course parameter from build_navigation()
- Updated all calls to build_navigation()

Author: Matt Clarkson <mattc@catalyst.net.nz>
Committer: Matt Clarkson <mattc@catalyst.net.nz>

diff --git a/course/mod.php b/course/mod.php
index 548fde2571535611bd2e2a9e3f7e5bbfc0ea7faa..5e33df4913b4c89de330a4c05544036268a7a5f2 100644 (file)
--- a/course/mod.php
+++ b/course/mod.php
@@ -674,7 +674,7 @@
     
     $crumbs[] = array('name' => $strmodulenameplural, 'link' => "$CFG->wwwroot/mod/$module->name/index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => $streditinga, 'link' => '', 'type' => 'action');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple($streditinga, '', $navigation, $focuscursor, "", false);
 

diff --git a/course/modedit.php b/course/modedit.php
index 1ff7e9b87fbe2d1badee7a1c973ed239505e5686..ed9d7f6e243e3bb2faa23aa63ee18c3dfb1513cf 100644 (file)
--- a/course/modedit.php
+++ b/course/modedit.php
@@ -305,7 +305,7 @@
         }
         $crumbs[] = array('name' => $streditinga, 'link' => '', 'type' => 'title');
         
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
         
         print_header_simple($streditinga, '', $navigation, $mform->focus(), "", false);
 

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index c569b6778171186caeec950eb02669cc1139bdaf..3b2998b45cd23f3b64e66c5e9cd6af3e3529b53d 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -6933,12 +6933,11 @@ function setup_lang_from_browser() {
  * @uses $CFG 
  * @uses $THEME
  * @param $extrabreadcrumbs - array of associative arrays, keys: name, link, type
- * @param $course - possibily the site course.
  * @return $navigation as an object so it can be differentiated from old style 
  * navigation strings.
  */
-function build_navigation($extrabreadcrumbs, $course = false) {
-    global $CFG, $THEME;
+function build_navigation($extrabreadcrumbs) {
+    global $CFG, $THEME, $COURSE;
     
     $navigation = '';
     check_theme_arrows();
@@ -6949,10 +6948,10 @@ function build_navigation($extrabreadcrumbs, $course = false) {
     }
 
     
-    if ($course) {
-        if ($course->id != SITEID) {
+    if ($COURSE) {
+        if ($COURSE->id != SITEID) {
             //Course
-            $breadcrumbs[] = array('name' => format_string($course->shortname), 'link' => "$CFG->wwwroot/course/view.php?id=$course->id",'type' => 'course');
+            $breadcrumbs[] = array('name' => format_string($COURSE->shortname), 'link' => "$CFG->wwwroot/course/view.php?id=$COURSE->id",'type' => 'course');
         }       
     }
 

diff --git a/lib/pagelib.php b/lib/pagelib.php
index a173d8e5f9d1f5e29f6975c61d069fea2526a790..076639822bf23f9d6a3f8c71c3630daab679dd0a 100644 (file)
--- a/lib/pagelib.php
+++ b/lib/pagelib.php
@@ -403,7 +403,7 @@ class page_course extends page_base {
             $crumbs = array_merge($crumbs, $morebreadcrumbs);
         }
 
-        $navigation = build_navigation($crumbs, $this->courserecord);
+        $navigation = build_navigation($crumbs);
 
         // The "Editing On" button will be appearing only in the "main" course screen
         // (i.e., no breadcrumbs other than the default one added inside this function)
@@ -643,7 +643,7 @@ class page_generic_activity extends page_base {
             $buttons = ' ';
         }
         
-        $navigation = build_navigation($crumbs, $this->courserecord);
+        $navigation = build_navigation($crumbs);
         
         print_header($title, $this->courserecord->fullname, $navigation, '', $meta, true, $buttons, navmenu($this->courserecord, $this->modulerecord), false, $bodytags);
     }

diff --git a/mod/assignment/index.php b/mod/assignment/index.php
index 9d4b5d4b0ba156ea1d832b5642f3b77ba201d7fb..a133017f310fd7c538f15f118855f5ed35088f8a 100644 (file)
--- a/mod/assignment/index.php
+++ b/mod/assignment/index.php
@@ -23,7 +23,7 @@
     $strgrade = get_string("grade");
 
     $crumbs[] = array('name' => $strassignments, 'link' => '', 'type' => 'activity');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple($strassignments, "", $navigation, "", "", true, "", navmenu($course));
 

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index e7c4760f5c02455d7899f6c13a8d7f811dc58de9..80044c713760394c980e21cb9da11b877ae0a4fd 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -86,7 +86,7 @@ class assignment_base {
             if (!$this->cm->visible and !has_capability('moodle/course:viewhiddenactivities', $context)) {
                 $pagetitle = strip_tags($this->course->shortname.': '.$this->strassignment);
                 $this->navigation[] = array('name' => $this->strassignment, 'link' => '', 'type' => 'activityinstance');
-                $navigation = build_navigation($this->navigation, $this->course);
+                $navigation = build_navigation($this->navigation);
                 
                 print_header($pagetitle, $this->course->fullname, "$this->navigation $this->strassignment", 
                              "", "", true, '', navmenu($this->course, $this->cm));
@@ -149,7 +149,7 @@ class assignment_base {
             $this->navigation[] = array('name' => format_string($this->assignment->name,true), 'link' => '', 'type' => 'activityinstance');
         }
         
-        $navigation = build_navigation($this->navigation, $this->course);
+        $navigation = build_navigation($this->navigation);
 
         print_header($this->pagetitle, $this->course->fullname, $navigation, '', '', 
                      true, update_module_button($this->cm->id, $this->course->id, $this->strassignment), 
@@ -998,7 +998,7 @@ class assignment_base {
         $crumbs[] = array('name' => $this->strassignments, 'link' => "index.php?id=$course->id", 'type' => 'activity');
         $crumbs[] = array('name' => format_string($this->assignment->name,true), 'link' => "view.php?a={$this->assignment->id}", 'type' => 'activityinstance');
         $crumbs[] = array('name' => $this->strsubmissions, 'link' => '', 'type' => 'title');
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
         
         print_header_simple(format_string($this->assignment->name,true), "", $navigation, '', '', true, update_module_button($cm->id, $course->id, $this->strassignment), navmenu($course, $cm));
     

diff --git a/mod/chat/index.php b/mod/chat/index.php
index 55df4997b11f9b421c4aa814052ad6294ef0ae5d..bb720ce0d3383c40049cc1775a3105b4c7ecdf85 100644 (file)
--- a/mod/chat/index.php
+++ b/mod/chat/index.php
@@ -23,7 +23,7 @@
 /// Print the header
 
     $crumbs[] = array('name' => $strchats, 'link' => '', 'type' => 'activity');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple($strchats, '', $navigation, '', '', true, '', navmenu($course));
 

diff --git a/mod/chat/report.php b/mod/chat/report.php
index bfbf9413adabc751960a760249f188e8118b0941..4813a20ed9ff134708eeb02ef0a47e7c86cb09c0 100644 (file)
--- a/mod/chat/report.php
+++ b/mod/chat/report.php
@@ -43,7 +43,7 @@
         $crumbs[] = array('name' => format_string($chat->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
         $crumbs[] = array('name' => $strchatreport, 'link' => "report.php?id=$cm->id", 'type' => 'title');
         
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
         
         print_header_simple(format_string($chat->name).": $strchatreport", '', $navigation,
                       '', '', true, '', navmenu($course, $cm));
@@ -99,7 +99,7 @@
     $crumbs[] = array('name' => format_string($chat->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strchatreport, 'link' => '', 'type' => 'title');
     
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple(format_string($chat->name).": $strchatreport", '', $navigation,
                   '', '', true, '', navmenu($course, $cm));

diff --git a/mod/choice/index.php b/mod/choice/index.php
index 77dc4314bb8c89a978e3c624c9ce4496da0aa620..1db9e4737e1a480e05151ac0d185a0ed54b91476 100644 (file)
--- a/mod/choice/index.php
+++ b/mod/choice/index.php
@@ -16,7 +16,7 @@
     $strchoice = get_string("modulename", "choice");
     $strchoices = get_string("modulenameplural", "choice");
     $crumbs[] = array('name' => $strchoices, 'link' => '', 'type' => 'activity');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple("$strchoices", "", $navigation, "", "", true, "", navmenu($course));
 

diff --git a/mod/choice/report.php b/mod/choice/report.php
index bba22546e59381665f50879ac9ee3ccfa4ffbc17..48e9e5dc4ff20752b1a5a864afd313e6b9568222 100644 (file)
--- a/mod/choice/report.php
+++ b/mod/choice/report.php
@@ -44,7 +44,7 @@
         $crumbs[] = array('name' => format_string($choice->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
         $crumbs[] = array('name' => $strresponses, 'link' => '', 'type' => 'title');
 
-        $navigation = build_navigation($crumbs, $course);    
+        $navigation = build_navigation($crumbs);    
     
         print_header_simple(format_string($choice->name).": $strresponses", "", $navigation, "", '', true,
                   update_module_button($cm->id, $course->id, $strchoice), navmenu($course, $cm));

diff --git a/mod/choice/view.php b/mod/choice/view.php
index 387fdaf3d8a10e49c1a85953356c7b04fcec6467..f047d52f6dbf23cfdf18f7303da57f3ba3534cb0 100644 (file)
--- a/mod/choice/view.php
+++ b/mod/choice/view.php
@@ -55,7 +55,7 @@
     $crumbs[] = array('name' => $strchoices, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($choice->name), 'link' => '', 'type' => 'activityinstance');
     
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple(format_string($choice->name), "", $navigation, "", "", true,
                   update_module_button($cm->id, $course->id, $strchoice), navmenu($course, $cm));

diff --git a/mod/data/edit.php b/mod/data/edit.php
index d403eff4adce202e46ca325ec263cd8f9d84411a..194ec8acd9b907fd7b0f7a4507dc36fd38cb9810 100755 (executable)
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -71,7 +71,7 @@
         
         $crumbs[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity');
         $crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
         
         print_header_simple(format_string($data->name), "", $navigation, "", "", true, '', navmenu($course, $cm));
         notice(get_string("activityiscurrentlyhidden"));
@@ -115,7 +115,7 @@
 
     $crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple($data->name, '', $navigation,
                         '', $meta, true, update_module_button($cm->id, $course->id, get_string('modulename', 'data')),

diff --git a/mod/data/field/latlong/kml.php b/mod/data/field/latlong/kml.php
index 9b0ce5b6da345bf6e8d1dd0d0b6cbe1b82c5a078..9b0f7416aa1a2314194961002c6e217e3ec329e1 100644 (file)
--- a/mod/data/field/latlong/kml.php
+++ b/mod/data/field/latlong/kml.php
@@ -59,7 +59,7 @@ require_course_login($course, true, $cm);
 if (empty($cm->visible) and !has_capability('moodle/course:viewhiddenactivities',get_context_instance(CONTEXT_MODULE, $cm->id))) {
     $crumbs[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
         
     print_header_simple(format_string($data->name), "", $navigation,
         "", "", true, '', navmenu($course, $cm));

diff --git a/mod/data/import.php b/mod/data/import.php
index f97af278965a278442d17de024587b653a54497f..bae831f91278c013ec40931f9a41cbb3e23e928f 100755 (executable)
--- a/mod/data/import.php
+++ b/mod/data/import.php
@@ -78,7 +78,7 @@
     
     $crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple($data->name, "", $navigation, "", "", true, "", navmenu($course));
     print_heading(format_string($data->name));

diff --git a/mod/data/index.php b/mod/data/index.php
index 739497d5fe2b21273a4fdd0195cbb9dec01c53c8..b6859af1f4627c10f5c5fe425f9f520719210d96 100755 (executable)
--- a/mod/data/index.php
+++ b/mod/data/index.php
@@ -43,7 +43,7 @@
     $strdata = get_string('modulename','data');
     
     $crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');    
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple($strdata, '', $navigation, '', '', true, "", navmenu($course));
 

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 5a694aef709bd74014b1f94a891c0b863ba5b389..f39975f364465e07f3af8036a6bf36a62bd10598 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1574,7 +1574,7 @@ function data_print_header($course, $cm, $data, $currenttab='') {
     $crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => $data->name, 'link' => '', 'type' => 'activityinstance');
     
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple($data->name, '', $navigation,
             '', '', true, update_module_button($cm->id, $course->id, get_string('modulename', 'data')),

diff --git a/mod/data/templates.php b/mod/data/templates.php
index 2183b0eb70f2fdbcae63b5d15bf698641866da6d..e608dae70ef5e961e4b8598ede299e3215607c40 100755 (executable)
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -98,7 +98,7 @@
     
     $crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple($data->name, '', $navigation,
                         '', $meta, true, update_module_button($cm->id, $course->id, get_string('modulename', 'data')),

diff --git a/mod/data/view.php b/mod/data/view.php
index f28a7b7f2395825253553cdbd315a56ac07a847e..bae0ca5ba32dd80f47f40df084bffabd26743cc5 100755 (executable)
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -92,7 +92,7 @@
         
         $crumbs[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity');
         $crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
         
         print_header_simple(format_string($data->name), "",
                  $navigation, "", "", true, '', navmenu($course, $cm));

diff --git a/mod/exercise/assessments.php b/mod/exercise/assessments.php
index 5985b2fa37a26cbbd867803e52e58305e6277bf6..12884d4ea620fb109719bfb616f8bd076598dbc9 100644 (file)
--- a/mod/exercise/assessments.php
+++ b/mod/exercise/assessments.php
@@ -66,7 +66,7 @@
     $crumbs[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strassessments, 'link' => '', 'type' => 'title');
     
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple(format_string($exercise->name), "", $navigation,
                   "", "", true);

diff --git a/mod/exercise/index.php b/mod/exercise/index.php
index edc48b4c7b893bd214b149c9213508f3d8d12ee1..dd92c4bca85b9f717d1d92486a9115a6182e7100 100644 (file)
--- a/mod/exercise/index.php
+++ b/mod/exercise/index.php
@@ -25,7 +25,7 @@
     $strsubmitted = get_string("submitted", "assignment");
     
     $crumbs[] = array('name' => $strexercises, 'link' => '', 'type' => 'activity');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple("$strexercises", "", $navigation, "", "", true, "", navmenu($course));
 

diff --git a/mod/exercise/submissions.php b/mod/exercise/submissions.php
index 7f12018c982d3eaba34983ff2560e4bd8bb86c4a..8698a8812cb35cedf0a0acc8c4c7ad3aff94a30b 100644 (file)
--- a/mod/exercise/submissions.php
+++ b/mod/exercise/submissions.php
@@ -54,7 +54,7 @@
     $crumbs[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strsubmissions, 'link' => '', 'type' => 'title');
     
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     print_header_simple(format_string($exercise->name), "", $navigation,
                   "", "", true);
 

diff --git a/mod/exercise/upload.php b/mod/exercise/upload.php
index e7632e01825fe33e3845aa960e626b11ee860ee1..491bf492318f0403a3765756182a930684de8eca 100644 (file)
--- a/mod/exercise/upload.php
+++ b/mod/exercise/upload.php
@@ -31,7 +31,7 @@
     $crumbs[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strupload, 'link' => '', 'type' => 'title');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple(format_string($exercise->name)." : $strupload", "", $navigation,
                   "", "", true);

diff --git a/mod/exercise/view.php b/mod/exercise/view.php
index f4a9d1c29a4752ded0d002c7479c775114af6aa4..8f073107fbc1af1126c756f3dd8c01544b7fe97c 100644 (file)
--- a/mod/exercise/view.php
+++ b/mod/exercise/view.php
@@ -49,7 +49,7 @@
     // ...display header...
     $crumbs[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($exercise->name), 'link' => '', 'type' => 'activityinstance');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple(format_string($exercise->name), "", $navigation,
                   "", "", true, update_module_button($cm->id, $course->id, $strexercise), navmenu($course, $cm));

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index 400b1a3055751b4b925b0516a93f91e82423e311..005d1bd381d5d4dce0ea5998896ae3338766d82b 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -136,7 +136,7 @@
 
     $searchform = forum_search_form($course);
     
-    $navigation = build_navigation($crumbs, $course); 
+    $navigation = build_navigation($crumbs); 
     print_header("$course->shortname: ".format_string($discussion->name), $course->fullname,
                      $navigation, "", "", true, $searchform, navmenu($course, $cm));
     

diff --git a/mod/forum/index.php b/mod/forum/index.php
index 38a38c656473b514a475d8e0427eadaa6c14e94b..4d5d97c7950e10996a49bddb203bb9a1ef7aadd3 100644 (file)
--- a/mod/forum/index.php
+++ b/mod/forum/index.php
@@ -454,7 +454,7 @@
     $crumbs[] = array('name' => $strforums, 'link' => '', 'type' => 'activity');
     
     print_header("$course->shortname: $strforums", $course->fullname,
-                    build_navigation($crumbs, $course),
+                    build_navigation($crumbs),
                     "", "", true, $searchform, navmenu($course));
 
     if (!isguest()) {

diff --git a/mod/forum/markposts.php b/mod/forum/markposts.php
index 3fff3ddbc9e967957417432e84a2f4f0ffd2b6d2..11b65129944d10506c685f7c9be500a35655349d 100644 (file)
--- a/mod/forum/markposts.php
+++ b/mod/forum/markposts.php
@@ -36,7 +36,7 @@
         $crumbs[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
         $crumbs[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
     
-        $navigation = build_navigation($crumbs, $course, $cm);
+        $navigation = build_navigation($crumbs);
         
         print_header($course->shortname, $course->fullname, $navigation, '', '', true, "", navmenu($course, $cm));
         notice_yesno(get_string('noguesttracking', 'forum').'<br /><br />'.get_string('liketologin'),

diff --git a/mod/forum/post.php b/mod/forum/post.php
index cfc4ca36bbb66e750510f28e3eccd177ceff249d..286c330f7223fa5cfcb33452191c1805beaae9c4 100644 (file)
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -61,7 +61,7 @@
         $crumbs[] = array('name' => get_string("forums", "forum"), 'link' => "../forum/view.php?f=$forum->id", 'type' => 'activity');
         $crumbs[] = array('name' => format_string($forum->name,true), 'link' => '../forum/index.php?id=$course->id', 'type' => 'activityinstance');
         
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
         
         
         print_header($course->shortname, $course->fullname, $navigation, '' , '', true, "", navmenu($course, $cm));
@@ -408,7 +408,7 @@
             $crumbs[] = array('name' => format_string($post->subject, true), 'link' => "discuss.php?d=$discussion->id", 'type' => 'title');
             $crumbs[] = array('name' => get_string("prune", "forum"), 'link' => '', 'type' => 'title');
             
-            $navigation = build_navigation($crumbs, $course);
+            $navigation = build_navigation($crumbs);
             
             print_header_simple(format_string($discussion->name).": ".format_string($post->subject), "", $navigation, '', "", true, "", navmenu($course, $cm));
 
@@ -664,7 +664,7 @@
     $forcefocus = empty($reply) ? NULL : 'message';
 
 
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
      
     print_header("$course->shortname: $strdiscussionname ".
                   format_string($toppost->subject), $course->fullname,

diff --git a/mod/forum/search.php b/mod/forum/search.php
index 76c416394f85ca7f5924394565f1920a4939b8de..bd2e13993c6bc99d4825cf52d04f575921f08128 100644 (file)
--- a/mod/forum/search.php
+++ b/mod/forum/search.php
@@ -102,7 +102,7 @@
     if (!$search || $showform) {
     
         $crumns[] = array('name' => $strsearch, 'link' => '', 'type' => 'title');
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
         
         print_header_simple("$strsearch", "", $navigation, 'search.words',
                   "", "", " ", navmenu($course));
@@ -121,7 +121,7 @@
 
     $crumbs[] = array('name' => $strsearch, 'link' => "search.php?id=$course->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => s($search, true), 'link' => '', 'type' => 'link');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
 
     if (!$posts = forum_search_posts($searchterms, $course->id, $page*$perpage, $perpage, $totalcount)) {

diff --git a/mod/forum/settracking.php b/mod/forum/settracking.php
index 81f4864c1393ab5462e0d0752496224a6f152305..cea87415debe68fbff69916be9e808d10509cff0 100644 (file)
--- a/mod/forum/settracking.php
+++ b/mod/forum/settracking.php
@@ -34,7 +34,7 @@
         $crumbs[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
         $crumbs[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
     
-        $navigation = build_navigation($crumbs, $course, $cm);
+        $navigation = build_navigation($crumbs);
         
         print_header($course->shortname, $course->fullname, $navigation, '', '', true, "", navmenu($course, $cm));
         notice_yesno(get_string('noguesttracking', 'forum').'<br /><br />'.get_string('liketologin'),

diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php
index 2a856986c49b240b0fd70098acf5900aee4c4e98..995871556d7523ed46da81defef8ba09e2752150 100644 (file)
--- a/mod/forum/subscribe.php
+++ b/mod/forum/subscribe.php
@@ -55,7 +55,7 @@
         $crumbs[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
         $crumbs[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
     
-        $navigation = build_navigation($crumbs, $course, $cm);
+        $navigation = build_navigation($crumbs);
         
         print_header($course->shortname, $course->fullname, $navigation, '', '', true, "", navmenu($course, $cm));
         

diff --git a/mod/forum/subscribers.php b/mod/forum/subscribers.php
index f8a98c86f6cefb928e4cf02212661eed0222e179..0109fd3056eada4ae1f83a642f6276fb82e56717 100644 (file)
--- a/mod/forum/subscribers.php
+++ b/mod/forum/subscribers.php
@@ -40,7 +40,7 @@
     $crumbs[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strsubscribers, 'link' => '', 'type' => 'title');
 
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     if (has_capability('mod/forum:managesubscriptions', $context)) {
         print_header_simple("$strsubscribers", "", $navigation,

diff --git a/mod/forum/user.php b/mod/forum/user.php
index adf67daa0c00965b10a6fb5fbbb717e77886b995..e3aae64ff5246d7127ff0d6ef1086821eb5793dd 100644 (file)
--- a/mod/forum/user.php
+++ b/mod/forum/user.php
@@ -45,7 +45,7 @@
     $crumbs[] = array('name' => $strforumposts, 'link' => '', 'type' => 'title');
     $crumbs[] = array('name' => $strmode, 'link' => '', 'type' => 'title');
     
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header("$course->shortname: $fullname: $strmode", $course->fullname,$navigation);
     

diff --git a/mod/forum/view.php b/mod/forum/view.php
index cb11bc83bb8174adce18b3223fd258532557711e..c57f82b3c39843cd3bd0f35959e2dd82c1237f31 100644 (file)
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -67,7 +67,7 @@
     $crumbs[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
     
-    $navigation = build_navigation($crumbs, $course, $cm);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple(format_string($forum->name), "",
                  $navigation, "", "", true, $buttontext, navmenu($course, $cm));

diff --git a/mod/glossary/comment.php b/mod/glossary/comment.php
index 5f13dfb0853e3008e62f7587da3ac97282b40621..0a7b8430aa38863380eb410275d6fc48170cbbae 100644 (file)
--- a/mod/glossary/comment.php
+++ b/mod/glossary/comment.php
@@ -228,7 +228,7 @@ function glossary_comment_print_header($course, $cm, $glossary, $entry, $action)
     $crumbs[] = array('name' => $strcomments, 'link' => "comments.php?id=$cm->id&eid=$entry->id", 'type' => 'title');
     $crumbs[] = array('name' => $straction, 'link' => '', 'type' => 'action');
     
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple(format_string($glossary->name), '', $navigation,
         '', '', true, update_module_button($cm->id, $course->id, $strglossary),

diff --git a/mod/glossary/comments.php b/mod/glossary/comments.php
index 3f5994472e87e356596c0058da2551d183bbe6dd..e09510fe8f48a2aa7bfbcfb077e8935c012c4b8c 100644 (file)
--- a/mod/glossary/comments.php
+++ b/mod/glossary/comments.php
@@ -45,7 +45,7 @@
     $crumbs[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($glossary->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strcomments, 'link' => '', 'type' => 'title');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple(strip_tags("$strcomments: $entry->concept"), "", $navigation,
         "", "", true, update_module_button($cm->id, $course->id, $strglossary),

diff --git a/mod/glossary/deleteentry.php b/mod/glossary/deleteentry.php
index 0f1180e6e2aa8cafd9ce1eedd6d50cba45c93f2c..1830f9a98d5d2c31cc814f4754be3afcecccffad 100644 (file)
--- a/mod/glossary/deleteentry.php
+++ b/mod/glossary/deleteentry.php
@@ -42,7 +42,7 @@
     $crumbs[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
 
-$navigation = build_navigation($crumbs, $course);
+$navigation = build_navigation($crumbs);
 
     print_header_simple(format_string($glossary->name), "", $navigation,
                   "", "", true, update_module_button($cm->id, $course->id, $strglossary),

diff --git a/mod/glossary/edit.php b/mod/glossary/edit.php
index 13c2228dc6152aefc05f9c65296ea1414a313784..66bbe8478bc80bcf547c961f542b69659ac35d89 100644 (file)
--- a/mod/glossary/edit.php
+++ b/mod/glossary/edit.php
@@ -196,7 +196,7 @@ $crumbs[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id"
 $crumbs[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
 $crumbs[] = array('name' => $stredit, 'link' => '', 'type' => 'title');
 
-$navigation = build_navigation($crumbs, $course);
+$navigation = build_navigation($crumbs);
 
 print_header_simple(format_string($glossary->name), "", $navigation, "",
               "", true, "", navmenu($course, $cm));

diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php
index 9c207c75945247aa83d9ff9be252bfca01fb509a..723956609bcad6d877a58a8d67c41bf8e7c7b54a 100644 (file)
--- a/mod/glossary/editcategories.php
+++ b/mod/glossary/editcategories.php
@@ -51,7 +51,7 @@
     $crumbs[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id&tab=GLOSSARY_CATEGORY_VIEW", 'type' => 'activityinstance');
     $crumbs[] = array('name' => get_string("categories","glossary"), 'link' => '', 'type' => 'title');
     
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple(format_string($glossary->name), "", $navigation,
                         "", "", true, update_module_button($cm->id, $course->id, $strglossary),

diff --git a/mod/glossary/export.php b/mod/glossary/export.php
index 003613d913abafd823ab242c4c6ce2f12a414365..484452d92ece0a350e126fdcc54db90ec23bb917 100644 (file)
--- a/mod/glossary/export.php
+++ b/mod/glossary/export.php
@@ -40,7 +40,7 @@
     $crumbs[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
    
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple(format_string($glossary->name), "",$navigation,
         "", "", true, update_module_button($cm->id, $course->id, $strglossary),

diff --git a/mod/glossary/exportentry.php b/mod/glossary/exportentry.php
index 0213ecefaeb28c3ba3c7ccf0d5e412cc61749365..2eef92d8de491d828df3af29e584eba151e30a2c 100644 (file)
--- a/mod/glossary/exportentry.php
+++ b/mod/glossary/exportentry.php
@@ -41,7 +41,7 @@
     $crumbs[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
    
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple(format_string($glossary->name), '', $navigation, '', '', true, '', navmenu($course, $cm));
 

diff --git a/mod/glossary/import.php b/mod/glossary/import.php
index 4ef0c497477943a2bc349031878b8a7b16eb5440..4d3b21f4c543eace094756d773be8137c963bc28 100644 (file)
--- a/mod/glossary/import.php
+++ b/mod/glossary/import.php
@@ -49,7 +49,7 @@
     $crumbs[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strimportentries, 'link' => '', 'type' => 'title');
    
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple(format_string($glossary->name), "", $navigation,
         "", "", true, update_module_button($cm->id, $course->id, $strglossary),

diff --git a/mod/glossary/index.php b/mod/glossary/index.php
index f17f5b6f89fb485df1f95a8a96da1e436928e1f3..e516c3f63532336fbcadc9d0679fdc41319dd1cb 100644 (file)
--- a/mod/glossary/index.php
+++ b/mod/glossary/index.php
@@ -28,7 +28,7 @@
 
 /// Print the header
     $crumbs[] = array('name' => $strglossarys, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple("$strglossarys", "", $navigation, "", "", true, "", navmenu($course));
 

diff --git a/mod/glossary/showentry.php b/mod/glossary/showentry.php
index dd74a706de039b57dc5c0ebc386f3c6c29fa8734..6ab55129737cc3c7be89e1cf32c56c9a83a96c8d 100644 (file)
--- a/mod/glossary/showentry.php
+++ b/mod/glossary/showentry.php
@@ -52,7 +52,7 @@
                $crumbs[] = array('name' => $strglossaries, 'link' => '', 'type' => 'activity');
             $crumbs[] = array('name' => $strsearch, 'link' => '', 'type' => 'title');
             
-            $navigation = build_navigation($crumbs, $course);
+            $navigation = build_navigation($crumbs);
             
             print_header(strip_tags("$course->shortname: $strglossaries $strsearch"), $course->fullname, $navigation, "", "", true, " ", " ");
         } else {

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 7eae7475753ba5eabbaf22b9fb91dbec45fe0f2d..0f90eef231d36f5f1ede7346d78b93dd977770b5 100644 (file)
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -232,14 +232,14 @@
         require_capability('mod/glossary:approve', $context);
         
         $crumbs[] = array('name' => $strwaitingapproval, 'link' => '', 'type' => 'title');
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
         
         print_header_simple(format_string($glossary->name), "", $navigation, "", "", true, 
             update_module_button($cm->id, $course->id, $strglossary), navmenu($course, $cm));
 
         print_heading($strwaitingapproval);
     } else { /// Print standard header
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
         print_header_simple(format_string($glossary->name), "", $navigation, "", "", true, 
             update_module_button($cm->id, $course->id, $strglossary), navmenu($course, $cm));
     }

diff --git a/mod/hotpot/index.php b/mod/hotpot/index.php
index faf07c21589f988f5d7ca10755611521e4945f30..e80f3dcfc1f343b6017cc8e9103b9b346f8ea269 100644 (file)
--- a/mod/hotpot/index.php
+++ b/mod/hotpot/index.php
@@ -38,7 +38,7 @@
     $heading = $course->fullname;
     
     $crumbs[] = array('name' => $strmodulenameplural, 'link' => '', 'type' => 'activity');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header($title, $heading, $navigation, "", "", true, "", navmenu($course));
 

diff --git a/mod/hotpot/report.php b/mod/hotpot/report.php
index bdb77f5c92b5a1a7c46d2ca9264f7c5aa50c0f23..d31f25ec48e9d4ed1febc4d81fa2e8376a65c5b9 100644 (file)
--- a/mod/hotpot/report.php
+++ b/mod/hotpot/report.php
@@ -423,7 +423,7 @@ function hotpot_print_report_heading(&$course, &$cm, &$hotpot, &$mode) {
     }
 
     $button = update_module_button($cm->id, $course->id, $strmodulename);
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     print_header($title, $heading, $navigation, "", "", true, $button, navmenu($course, $cm));
 
     print_heading($hotpot->name);

diff --git a/mod/hotpot/review.php b/mod/hotpot/review.php
index 578049f8a36dcb837ff918d72eef24b86acbac6b..eb399ae4a9d46a2d0f50ad25978bb18f1ecd493a 100644 (file)
--- a/mod/hotpot/review.php
+++ b/mod/hotpot/review.php
@@ -55,7 +55,7 @@
     
     $crumbs[] = array('name' => $strmodulenameplural, 'link' => 'index.php?id='.$course->id, 'type' => 'activity');
     $crumbs[] = array('name' => get_string("review", "quiz"), 'link' => '', 'type' => 'activityinstance');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
 
     $button = update_module_button($cm->id, $course->id, $strmodulename);

diff --git a/mod/hotpot/view.php b/mod/hotpot/view.php
index 4197aec39f7b687ed2b08f63d7b47fe8cc1d5636..9d2f3b47789add3bb5c5c49f1fcc1a553293f153 100644 (file)
--- a/mod/hotpot/view.php
+++ b/mod/hotpot/view.php
@@ -45,7 +45,7 @@
     $crumbs[] = array('name' => get_string("modulenameplural", "hotpot"), 'link' => $CFG->wwwroot.'/mod/hotpot/index.php?id='.$course->id, 'type' => 'activity');
     $crumbs[] = array('name' => $hotpot->name, 'link' => '', 'type' => 'activityinstance');
     
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
         
     $button = update_module_button($cm->id, $course->id, get_string("modulename", "hotpot"));
     $button = '<div style="font-size:0.75em;">'.$button.'</div>';

diff --git a/mod/journal/edit.php b/mod/journal/edit.php
index 7fe866874518489e0ae53444bc59c2a479ff1f0c..27ad00e81cf23da5e63647c0edcba0ef08393afe 100644 (file)
--- a/mod/journal/edit.php
+++ b/mod/journal/edit.php
@@ -78,7 +78,7 @@
     $crumbs[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($journal->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $stredit, 'link' => '', 'type' => 'action');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple(format_string($journal->name), "", $navigation, "",
                   "", true, "", navmenu($course, $cm));

diff --git a/mod/journal/index.php b/mod/journal/index.php
index c5de71b19741d1c7fff02e821e34cb9d28d8a503..b7ec1bd177d0ab1131836301b0651854bf88aaa3 100644 (file)
--- a/mod/journal/index.php
+++ b/mod/journal/index.php
@@ -18,7 +18,7 @@
     $strtopic = get_string("topic");
     
     $crumbs[] = array('name' => $strjournals, 'link' => '', 'type' => 'activity');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple("$strjournals", "", $navigation, 
                  "", "", true, "", navmenu($course));

diff --git a/mod/journal/report.php b/mod/journal/report.php
index 3984042bb3bd91a7f6556c65c2acdf13909bc3d5..1ab7eeb8117441f92b27f0382f3e9cdc018b431a 100644 (file)
--- a/mod/journal/report.php
+++ b/mod/journal/report.php
@@ -41,7 +41,7 @@
     $crumbs[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($journal->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strentries, 'link' => '', 'type' => 'title');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple("$strjournals", "", $navigation, "", "", true);
 

diff --git a/mod/journal/view.php b/mod/journal/view.php
index 4fe6dc1ebddd664e863102f23816bb2ad53cd03c..5a2dd4714c6721c79b08696a3728438fb25a0761 100644 (file)
--- a/mod/journal/view.php
+++ b/mod/journal/view.php
@@ -30,7 +30,7 @@
     
     $crumbs[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($journal->name), 'link' => '', 'type' => 'activityinstance');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple(format_string($journal->name), '', $navigation, '', '', true,
                   update_module_button($cm->id, $course->id, $strjournal), navmenu($course, $cm));

diff --git a/mod/lesson/import.php b/mod/lesson/import.php
index f897cda4141b29d93fd9d328009e2a5c49fb407f..98fdfe0a8268af9f76d27e8bb6dd6e305ee079dc 100644 (file)
--- a/mod/lesson/import.php
+++ b/mod/lesson/import.php
@@ -39,7 +39,7 @@
     $crumbs[] = array('name' => format_string($lesson->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strimportquestions, 'link' => '', 'type' => 'title');
             
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple("$strimportquestions", " $strimportquestions", $navigation);
 

diff --git a/mod/lesson/importppt.php b/mod/lesson/importppt.php
index 4aa26e29db4b6ba028085e8660e0c865ff7a33a1..fb057f1a8746884f8d5f712441c10d66e4022b5e 100644 (file)
--- a/mod/lesson/importppt.php
+++ b/mod/lesson/importppt.php
@@ -48,7 +48,7 @@
     $crumbs[] = array('name' => format_string($mod->name,true), 'link' => "$CFG->wwwroot/mod/$modname/view.php?id=$cm->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strimportppt, 'link' => '', 'type' => 'title');
             
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple("$strimportppt", " $strimportppt", $navigation);
 

diff --git a/mod/lesson/index.php b/mod/lesson/index.php
index ddc567a26779bad6038988df0fbf7589268b6f7d..eb61157e84bb176ddb94d1305da569974e5b4530 100644 (file)
--- a/mod/lesson/index.php
+++ b/mod/lesson/index.php
@@ -32,7 +32,7 @@
 
     $crumbs[] = array('name' => $strlessons, 'link' => '', 'type' => 'activity');
     
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header("$course->shortname: $strlessons", $course->fullname, $navigation, "", "", true, "", navmenu($course));
 

diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index 8e536542aeacb02aa64bdc76cc76abcb41307a05..859ca26bb8a8d90de19862adc61987481fd2bc1e 100644 (file)
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -243,7 +243,7 @@ function lesson_print_header($cm, $course, $lesson, $currenttab = '') {
     $crumbs[] = array('name' => $strlessons, 'link' => "$CFG->wwwroot/mod/lesson/index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => $strname, 'link' => '', 'type' => 'activityinstance');
     
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
 /// Print header, heading, tabs and messages
     print_header("$course->shortname: $strname", $course->fullname, $navigation,

diff --git a/mod/lesson/pagelib.php b/mod/lesson/pagelib.php
index 0e0d777af90f9d5b3baed3d268472f82c72d7192..5626f32872d274ff2bbf9344aa6bce023f89237d 100644 (file)
--- a/mod/lesson/pagelib.php
+++ b/mod/lesson/pagelib.php
@@ -132,7 +132,7 @@ class page_lesson extends page_generic_activity {
             $meta = '';
         // }
 
-        $navigation = build_navigation($crumbs, $this->courserecord);
+        $navigation = build_navigation($crumbs);
 
         print_header($title, $this->courserecord->fullname, $navigation, '', $meta, true, $buttons, navmenu($this->courserecord, $this->modulerecord));
 

diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php
index 14a193eeae183a2d0e12fc07cbd6e7f1ea609628..37c71300be2aeb6663c9c4ad3451389b026b8100 100644 (file)
--- a/mod/quiz/attempt.php
+++ b/mod/quiz/attempt.php
@@ -406,7 +406,7 @@
         $crumbs[] = array('name' => format_string($quiz->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
         $crumbs[] = array('name' => $strattemptnum, 'link' => '', 'type' => 'title');
         
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
         
         print_header_simple(format_string($quiz->name), "", $navigation, "", "", true, $strupdatemodule);
     }

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 23042a12f9bb0a53d16907d1a5a5b54df8f63ad3..c25eec24688cfa4217923b2b65779f5bf09666c5 100644 (file)
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -299,7 +299,7 @@
         $crumbs[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity');    
         $crumbs[] = array('name' => format_string($modform->name), 'link' => "view.php?q=$modform->instance", 'type' => 'activityinstance');    
         $crumbs[] = array('name' => $streditingquiz, 'link' => '', 'type' => 'title');
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
            
         print_header_simple($streditingquiz, '', $navigation, "", "",
                  true, $strupdatemodule);
@@ -339,7 +339,7 @@
     $crumbs[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity');    
     $crumbs[] = array('name' => format_string($modform->name), 'link' => "view.php?q=$modform->instance", 'type' => 'activityinstance');    
     $crumbs[] = array('name' => $streditingquiz, 'link' => '', 'type' => 'title');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple($streditingquiz, '', $navigation, "", "", true, $strupdatemodule);
 

diff --git a/mod/quiz/index.php b/mod/quiz/index.php
index eeee9f3d4338321604a7d137c0688720b7ab7d79..30a99d12b347bacc89bed09235e1a03850136c86 100644 (file)
--- a/mod/quiz/index.php
+++ b/mod/quiz/index.php
@@ -32,7 +32,7 @@
     }
     
     $crumbs[] = array('name' => $strquizzes, 'link' => '', 'type' => 'activity');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple($strquizzes, '', $navigation,
                  '', '', true, $streditquestions, navmenu($course));

diff --git a/mod/quiz/report/default.php b/mod/quiz/report/default.php
index ca5b0e07c97e4cf7dca6c323376fc1ffa1ae57c3..f59fccf6c40648cad4a9b7ddbe14d500e4fe6f65 100644 (file)
--- a/mod/quiz/report/default.php
+++ b/mod/quiz/report/default.php
@@ -29,7 +29,7 @@ class quiz_default_report {
     /// Print the page header
         $crumbs[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity');
         $crumbs[] = array('name' => format_string($quiz->name), 'link' => '', 'type' => 'activityinstance');
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
         
         print_header_simple(format_string($quiz->name), "", $navigation,
                      '', $meta, true, update_module_button($cm->id, $course->id, $strquiz), navmenu($course, $cm));

diff --git a/mod/quiz/review.php b/mod/quiz/review.php
index f0de1dd24eeab0e20bc6b1bbb2d7cc887c4c49d1..9e83fff6785a01b5f02b6b92ba804081cb669af0 100644 (file)
--- a/mod/quiz/review.php
+++ b/mod/quiz/review.php
@@ -103,7 +103,7 @@
         $crumbs[] = array('name' => format_string($quiz->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
         $crumbs[] = array('name' => $strreview, 'link' => '', 'type' => 'title');
         
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
                
         print_header_simple(format_string($quiz->name), "", $navigation, "", "", true, $strupdatemodule);
     }

diff --git a/mod/resource/index.php b/mod/resource/index.php
index f7de1287e3ee2259ae5bb575a0fa8f1cfc74d65c..e4ef54622d3ec0de9494f52dbc39e5bfb3866c05 100644 (file)
--- a/mod/resource/index.php
+++ b/mod/resource/index.php
@@ -29,7 +29,7 @@
     
   
     $crumbs[] = array('name' => $strresources, 'link' => '', 'type' => 'activityinstance');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header("$course->shortname: $strresources", $course->fullname, $navigation, 
                  "", "", true, "", navmenu($course));

diff --git a/mod/resource/lib.php b/mod/resource/lib.php
index f7241cbed70281f8f154e5a6c79301bad3078a06..a1437a0db50733ff59465b99cfdc28b3cbdc52f7 100644 (file)
--- a/mod/resource/lib.php
+++ b/mod/resource/lib.php
@@ -113,7 +113,7 @@ function resource_base($cmid=0) {
         if (!$this->cm->visible and !has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_MODULE, $this->cm->id))) {
             $pagetitle = strip_tags($this->course->shortname.': '.$this->strresource);
             $this->crumbs[] = array('name' => $this->strresource, 'link' => '', 'type' => 'activityinstance');
-            $this->navigation = build_navigation($this->crumbs, $this->course);
+            $this->navigation = build_navigation($this->crumbs);
             
             print_header($pagetitle, $this->course->fullname, $this->navigation, "", "", true, '', navmenu($this->course, $this->cm));
             notice(get_string("activityiscurrentlyhidden"), "$CFG->wwwroot/course/view.php?id={$this->course->id}");

diff --git a/mod/resource/type/directory/resource.class.php b/mod/resource/type/directory/resource.class.php
index 7133efc690fe65c5a33f76a4f3be931b7f72234a..6d9d3b62635176c40339b4c8f7be58fff19dcde4 100644 (file)
--- a/mod/resource/type/directory/resource.class.php
+++ b/mod/resource/type/directory/resource.class.php
@@ -70,7 +70,7 @@ function display() {
         $editfiles = print_single_button("$CFG->wwwroot/files/index.php", $options, get_string("editfiles"), 'get', '', true);
         $update = $editfiles.$update;
     }
-    $this->navigation = build_navigation($this->crumbs, $this->course);
+    $this->navigation = build_navigation($this->crumbs);
     print_header($pagetitle, $course->fullname, $this->navigation,
             "", "", true, $update,
             navmenu($course, $cm));

diff --git a/mod/resource/type/html/resource.class.php b/mod/resource/type/html/resource.class.php
index 2610257176251ce00070ab34539a28b9a88e4606..c41e7b5b325c597ef76f5f1de1e75beba086834c 100644 (file)
--- a/mod/resource/type/html/resource.class.php
+++ b/mod/resource/type/html/resource.class.php
@@ -72,7 +72,7 @@ function display() {
         $pagetitle = strip_tags($course->shortname.': '.format_string($resource->name));
         $inpopup = optional_param('inpopup', '', PARAM_BOOL);
         
-        // fix for MDL-9021, thanks Etienne Rozé
+        // fix for MDL-9021, thanks Etienne Roz
         add_to_log($course->id, "resource", "view", "view.php?id={$cm->id}", $resource->id, $cm->id);
 
         if ($resource->popup) {
@@ -85,7 +85,7 @@ function display() {
             } else {                           /// Make a page and a pop-up window
 
                 $this->crumbs[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
-                $this->navigation = build_navigation($this->crumbs, $this->course);
+                $this->navigation = build_navigation($this->crumbs);
                 
                 print_header($pagetitle, $course->fullname, $this->navigation,
                         "", "", true, update_module_button($cm->id, $course->id, $this->strresource),
@@ -114,7 +114,7 @@ function display() {
         } else {    /// not a popup at all
 
             $this->crumbs[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
-            $this->navigation = build_navigation($this->crumbs, $this->course);
+            $this->navigation = build_navigation($this->crumbs);
             
             print_header($pagetitle, $course->fullname, $this->navigation,
                     "", "", true, update_module_button($cm->id, $course->id, $this->strresource),

diff --git a/mod/resource/type/ims/deploy.php b/mod/resource/type/ims/deploy.php
index 8f26e2dcc3d2bc2c3c22be5b014308f8373d9cf1..96072862e917832de03b10e5bbc39464a1a90fbf 100644 (file)
--- a/mod/resource/type/ims/deploy.php
+++ b/mod/resource/type/ims/deploy.php
@@ -66,7 +66,7 @@
        
         $resource_obj->crumbs[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
         $resource_obj->crumbs[] = array('name' => $strdeploy, 'link' => '', 'type' => 'action');
-        $navigation = build_navigation($resource_obj->crumbs, $resource_obj->course);
+        $navigation = build_navigation($resource_obj->crumbs);
         print_header($pagetitle, $course->fullname, $navigation,
                      '', '', true, 
                      update_module_button($cm->id, $course->id, $resource_obj->strresource));

diff --git a/mod/resource/type/ims/resource.class.php b/mod/resource/type/ims/resource.class.php
index 2cee64a7aa3609091b5d910d07e5b135bcc3b250..930fb37505bb68764fbba0d5076dd11d67aa8fd5 100644 (file)
--- a/mod/resource/type/ims/resource.class.php
+++ b/mod/resource/type/ims/resource.class.php
@@ -373,7 +373,7 @@ class resource_ims extends resource_base {
             } else {
                
                 $this->crumbs[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
-                $this->navigation = build_navigation($this->crumbs, $this->course);
+                $this->navigation = build_navigation($this->crumbs);
                  
                 print_header($pagetitle, $course->fullname, $this->navigation, "", "", true, update_module_button($cm->id, $course->id, $this->strresource), navmenu($course, $cm));
             }
@@ -474,7 +474,7 @@ class resource_ims extends resource_base {
                 print_header();
             } else {
                $this->crumbs[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
-                $this->navigation = build_navigation($this->crumbs, $this->course);
+                $this->navigation = build_navigation($this->crumbs);
                 print_header($pagetitle, $course->fullname, $this->navigation, "", "", true, update_module_button($cm->id, $course->id, $this->strresource), navmenu($course, $cm, "parent"));
             }
         /// content - this produces everything else

diff --git a/mod/resource/type/text/resource.class.php b/mod/resource/type/text/resource.class.php
index baef7b1b5c1f50923e87ad20c8dcebb91300efb0..6c2af43e79d9ee598dd3d842faa3b381da3400c1 100644 (file)
--- a/mod/resource/type/text/resource.class.php
+++ b/mod/resource/type/text/resource.class.php
@@ -111,7 +111,7 @@ function display() {
 
             add_to_log($course->id, "resource", "view", "view.php?id={$cm->id}", $resource->id, $cm->id);
             $this->crumbs[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'title');
-            $this->navigation = build_navigation($this->crumbs, $this->course);
+            $this->navigation = build_navigation($this->crumbs);
             
             print_header($pagetitle, $course->fullname, $this->navigation,
                     "", "", true, update_module_button($cm->id, $course->id, $this->strresource),

diff --git a/mod/scorm/index.php b/mod/scorm/index.php
index 49b484a37cd831731b8808b7a180a032e8899ca7..e4d378e713b613d29e732c7ebe69d378dc566ef0 100755 (executable)
--- a/mod/scorm/index.php
+++ b/mod/scorm/index.php
@@ -26,7 +26,7 @@
     $strlastmodified = get_string("lastmodified");
     
     $crumbs[] = array('name' => $strscorms, 'link' => '', 'type' => 'activity');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple("$strscorms", "", $navigation,
                  "", "", true, "", navmenu($course));

diff --git a/mod/scorm/player.php b/mod/scorm/player.php
index 8bbf656fbdbeeecac4d34551ae18b098b4be3674..d4c6e91c908d33624dd8cf8a9bf52985ad26bad3 100755 (executable)
--- a/mod/scorm/player.php
+++ b/mod/scorm/player.php
@@ -59,7 +59,7 @@
 
     if (!$cm->visible and !has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_COURSE,$course->id))) {
         $crumbs[] = array('name' => format_string($scorm->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
         
         print_header($pagetitle, $course->fullname, $navigation,
                  '', '', true, update_module_button($cm->id, $course->id, $strscorm), '', false);
@@ -125,7 +125,7 @@
     }
     
     $crumbs[] = array('name' => format_string($scorm->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header($pagetitle, $course->fullname,
                  $navigation,

diff --git a/mod/scorm/report.php b/mod/scorm/report.php
index d3136c8e395b36744d47ee854713ce1ac374f338..cb543202c9bd34ff7f47c753d12ad29941537d58 100755 (executable)
--- a/mod/scorm/report.php
+++ b/mod/scorm/report.php
@@ -69,14 +69,14 @@
         
         if (empty($b)) {
             if (empty($a)) {
-                $navigation = build_navigation($crumbs, $course);
+                $navigation = build_navigation($crumbs);
                 print_header("$course->shortname: ".format_string($scorm->name), $course->fullname,$navigation,
                              '', '', true);
             } else {
                 
                 $crumbs[] = array('name' => $strreport, 'link' => "report.php?id=$cm->id", 'type' => 'title');    
                 $crumbs[] = array('name' => "$strattempt $attempt - ".fullname($userdata), 'link' => '', 'type' => 'title');
-                $navigation = build_navigation($crumbs, $course);
+                $navigation = build_navigation($crumbs);
                     
                 print_header("$course->shortname: ".format_string($scorm->name), $course->fullname,
                              $navigation, '', '', true);
@@ -86,7 +86,7 @@
             $crumbs[] = array('name' => $strreport, 'link' => "report.php?id=$cm->id", 'type' => 'title');    
             $crumbs[] = array('name' => "$strattempt $attempt - ".fullname($userdata), 'link' => "report.php?a=$a&user=$user&attempt=$attempt", 'type' => 'title');
             $crumbs[] = array('name' => $sco->title, 'link' => '', 'type' => 'title');
-            $navigation = build_navigation($crumbs, $course);
+            $navigation = build_navigation($crumbs);
             
             print_header("$course->shortname: ".format_string($scorm->name), $course->fullname, $navigation,
                      '', '', true);

diff --git a/mod/scorm/view.php b/mod/scorm/view.php
index cd913c134b9ac350df1e26011bb7ca21f1c236c1..5e8e64f631b39a47ef7b5e0d06928627820ac4ae 100755 (executable)
--- a/mod/scorm/view.php
+++ b/mod/scorm/view.php
@@ -64,7 +64,7 @@
     // Print the page header
     //
     $crumbs[] = array('name' => format_string($scorm->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header($pagetitle, $course->fullname, $navigation,
                  '', '', true, update_module_button($cm->id, $course->id, $strscorm), navmenu($course, $cm));

diff --git a/mod/survey/index.php b/mod/survey/index.php
index b8238ee919e957adbfd800b27bce6d9da3585250..b078f0241e7c67cee711a881940eb13174152e64 100644 (file)
--- a/mod/survey/index.php
+++ b/mod/survey/index.php
@@ -22,7 +22,7 @@
     $strnotdone  = get_string("notdone", "survey");
     
     $crumbs[] = array('name' => $strsurveys, 'link' => '', 'type' => 'activity');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple("$strsurveys", "", $navigation, 
                  "", "", true, "", navmenu($course));

diff --git a/mod/survey/report.php b/mod/survey/report.php
index 1d7e49a15127e5f5a3cdbe50dddef524245d3e1d..cced689e574bb846706f5d3a5b35f8387a98c781 100644 (file)
--- a/mod/survey/report.php
+++ b/mod/survey/report.php
@@ -68,7 +68,7 @@
     $crumbs[] = array('name' => $strsurveys, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($survey->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strreport, 'link' => '', 'type' => 'title');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header("$course->shortname: ".format_string($survey->name), $course->fullname, $navigation,
                  "", "", true,

diff --git a/mod/survey/save.php b/mod/survey/save.php
index 25f075b7e8ca4dcfb429d88a96efc3defa0b6fe1..141fc9328f5264a9f7105a88dbe715a0df30b488 100644 (file)
--- a/mod/survey/save.php
+++ b/mod/survey/save.php
@@ -36,7 +36,7 @@
     $crumbs[] = array('name' => $strsurveys, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($survey->name), 'link' => '', 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strsurveysaved, 'link' => '', 'type' => 'title');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple("$strsurveysaved", "", $navigation, "");
 

diff --git a/mod/survey/view.php b/mod/survey/view.php
index 583f61e8954b9e792022306c864b738debdb3fb1..ee7bc86c00656be9cd8708a94c84a3cbb6cdf12c 100644 (file)
--- a/mod/survey/view.php
+++ b/mod/survey/view.php
@@ -39,7 +39,7 @@
 
     $crumbs[] = array('name' => $strsurveys, 'link' => "index.php?id=$course->id", 'type' => 'activity');;
     $crumbs[] = array('name' => format_string($survey->name), 'link' => '', 'type' => 'activityinistance');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple(format_string($survey->name), "", $navigation, "", "", true,
                   update_module_button($cm->id, $course->id, $strsurvey), navmenu($course, $cm));

diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php
index cffc52eebef34fca3128205294b697911964ab9d..65228b22a3fc6af60d654f6829f774a4b36f7ecb 100644 (file)
--- a/mod/wiki/admin.php
+++ b/mod/wiki/admin.php
@@ -118,7 +118,7 @@
     $crumbs[] = array('name' => format_string($wiki->name,true), 'link' => "view.php?id=$moodleID", 'type' => 'activityinstace');
     $crumbs[] = array('name' => get_string("administration","wiki"), 'link' => '', 'type' => 'title');
     
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple("$wiki_entry->pagename", "", $navigation,
                 $focus, "", true, update_module_button($cm->id, $course->id, $strwiki),

diff --git a/mod/wiki/index.php b/mod/wiki/index.php
index ccb6cb4dde32f1c39ead51d7831f4c1a4154c039..9d1c18aa2fcb9e272ba2a6f993578a4088cf5c3e 100644 (file)
--- a/mod/wiki/index.php
+++ b/mod/wiki/index.php
@@ -25,7 +25,7 @@
 
 /// Print the header
     $crumbs[] = array('name' => $strwikis, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple("$strwikis", "", $navigation, "", "", true, "", navmenu($course));
 

diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index a4f576d7bbb4ec4d251eebfd553499a7ceb0e260..ed09038a740aea5722c42529751ace8c88544010 100644 (file)
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -284,7 +284,7 @@
     $crumbs[] = array('name' => $strwikis, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($wiki->name,true), 'link' => "view.php?id=$moodleID", 'type' => 'activityinstace');
 
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple($ewiki_title?$ewiki_title:format_string($wiki->name), "", $navigation,
                 "", "", $cacheme, update_module_button($cm->id, $course->id, $strwiki),

diff --git a/mod/workshop/assess.php b/mod/workshop/assess.php
index f4cfebec09ea0546fb68e79b06c77ec3c8a8d6c4..ee9cb8359520172b0bf17428580f9d77eae4228f 100644 (file)
--- a/mod/workshop/assess.php
+++ b/mod/workshop/assess.php
@@ -64,7 +64,7 @@
         $crumbs[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
         $crumbs[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
         $crumbs[] = array('name' => $strassess, 'link' => '', 'type' => 'title');
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
         
         print_header_simple(format_string($workshop->name), "",$navigation,
                       "", '', true);

diff --git a/mod/workshop/assessments.php b/mod/workshop/assessments.php
index e2150838ba68e2d56eb88667b527da035211511c..88ca8ec6e1d496bd20d3590839d5dc8428e8f6a6 100644 (file)
--- a/mod/workshop/assessments.php
+++ b/mod/workshop/assessments.php
@@ -74,7 +74,7 @@
     $crumbs[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strassessments, 'link' => '', 'type' => 'title');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple(format_string($workshop->name), "", $navigation,
                   "", "", true);

diff --git a/mod/workshop/index.php b/mod/workshop/index.php
index 09f3374b642e753cf597435a1cf59aa21d7174d8..4e11a271136f8e4d12ba5cfdda5b53a0d2e18301 100644 (file)
--- a/mod/workshop/index.php
+++ b/mod/workshop/index.php
@@ -24,7 +24,7 @@
     $strsubmitted = get_string("submitted", "assignment");
     
     $crumbs[] = array('name' => $strworkshops, 'link' => '', 'type' => 'activity');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple("$strworkshops", "", $navigation, "", "", true, "", navmenu($course));
 

diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php
index cdb028049e139574cbc76de9fc483d767ddda755..916fe510b9474c45ebebb646721092d0289b7988 100644 (file)
--- a/mod/workshop/submissions.php
+++ b/mod/workshop/submissions.php
@@ -54,7 +54,7 @@
     $crumbs[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strsubmissions, 'link' => '', 'type' => 'title');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
     
     print_header_simple(format_string($workshop->name), "", $navigation,
                   "", "", true);

diff --git a/mod/workshop/upload.php b/mod/workshop/upload.php
index 3b880aa347def6c0033edb527212bd2485101246..ae131f9777f3fb72c64f26dd53a59119d2de8981 100644 (file)
--- a/mod/workshop/upload.php
+++ b/mod/workshop/upload.php
@@ -26,7 +26,7 @@
     $crumbs[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
     $crumbs[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
     $crumbs[] = array('name' => $strsubmission, 'link' => '', 'type' => 'title');
-    $navigation = build_navigation($crumbs, $course);
+    $navigation = build_navigation($crumbs);
 
     print_header_simple(format_string($workshop->name)." : $strsubmission", "", $navigation,
                   "", "", true);

diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index 8cca3b6d94cba05c1cfe0eee70fab82b5b1cefb9..18d89f3156077a56d180f4bde90e53778747dd61 100644 (file)
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -74,7 +74,7 @@
     if ($straction) {
         $crumbs[] = array('name' => $straction, 'link' => '', 'type' => 'title');
     }
-    $navigation = build_navigation($crumbs, $course);    
+    $navigation = build_navigation($crumbs);    
     
     print_header_simple(format_string($workshop->name), "", $navigation,
                   "", "", true, update_module_button($cm->id, $course->id, $strworkshop), navmenu($course, $cm));

diff --git a/mod/workshop/viewassessment.php b/mod/workshop/viewassessment.php
index 7ea7d29171c2302261e8f5733c47736a5c697a6e..8ef0f8999488ad7bbd29c5e10fcae89b02e795ca 100644 (file)
--- a/mod/workshop/viewassessment.php
+++ b/mod/workshop/viewassessment.php
@@ -61,7 +61,7 @@
         $crumbs[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
         $crumbs[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
         $crumbs[] = array('name' => $strassess, 'link' => '', 'type' => 'title');
-        $navigation = build_navigation($crumbs, $course);
+        $navigation = build_navigation($crumbs);
         
         // removed <base target="_parent" /> as it does not validate
         print_header_simple(format_string($workshop->name), "", $navigation,