From 70c6c0ad70f500b0d9d4a65bfd38c6c3a4c1daa7 Mon Sep 17 00:00:00 2001
From: mattc-catalyst <mattc-catalyst>
Date: Mon, 23 Apr 2007 21:11:10 +0000
Subject: [PATCH] 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>
---
course/mod.php | 2 +-
course/modedit.php | 2 +-
lib/moodlelib.php | 11 +++++------
lib/pagelib.php | 4 ++--
mod/assignment/index.php | 2 +-
mod/assignment/lib.php | 6 +++---
mod/chat/index.php | 2 +-
mod/chat/report.php | 4 ++--
mod/choice/index.php | 2 +-
mod/choice/report.php | 2 +-
mod/choice/view.php | 2 +-
mod/data/edit.php | 4 ++--
mod/data/field/latlong/kml.php | 2 +-
mod/data/import.php | 2 +-
mod/data/index.php | 2 +-
mod/data/lib.php | 2 +-
mod/data/templates.php | 2 +-
mod/data/view.php | 2 +-
mod/exercise/assessments.php | 2 +-
mod/exercise/index.php | 2 +-
mod/exercise/submissions.php | 2 +-
mod/exercise/upload.php | 2 +-
mod/exercise/view.php | 2 +-
mod/forum/discuss.php | 2 +-
mod/forum/index.php | 2 +-
mod/forum/markposts.php | 2 +-
mod/forum/post.php | 6 +++---
mod/forum/search.php | 4 ++--
mod/forum/settracking.php | 2 +-
mod/forum/subscribe.php | 2 +-
mod/forum/subscribers.php | 2 +-
mod/forum/user.php | 2 +-
mod/forum/view.php | 2 +-
mod/glossary/comment.php | 2 +-
mod/glossary/comments.php | 2 +-
mod/glossary/deleteentry.php | 2 +-
mod/glossary/edit.php | 2 +-
mod/glossary/editcategories.php | 2 +-
mod/glossary/export.php | 2 +-
mod/glossary/exportentry.php | 2 +-
mod/glossary/import.php | 2 +-
mod/glossary/index.php | 2 +-
mod/glossary/showentry.php | 2 +-
mod/glossary/view.php | 4 ++--
mod/hotpot/index.php | 2 +-
mod/hotpot/report.php | 2 +-
mod/hotpot/review.php | 2 +-
mod/hotpot/view.php | 2 +-
mod/journal/edit.php | 2 +-
mod/journal/index.php | 2 +-
mod/journal/report.php | 2 +-
mod/journal/view.php | 2 +-
mod/lesson/import.php | 2 +-
mod/lesson/importppt.php | 2 +-
mod/lesson/index.php | 2 +-
mod/lesson/locallib.php | 2 +-
mod/lesson/pagelib.php | 2 +-
mod/quiz/attempt.php | 2 +-
mod/quiz/edit.php | 4 ++--
mod/quiz/index.php | 2 +-
mod/quiz/report/default.php | 2 +-
mod/quiz/review.php | 2 +-
mod/resource/index.php | 2 +-
mod/resource/lib.php | 2 +-
mod/resource/type/directory/resource.class.php | 2 +-
mod/resource/type/html/resource.class.php | 6 +++---
mod/resource/type/ims/deploy.php | 2 +-
mod/resource/type/ims/resource.class.php | 4 ++--
mod/resource/type/text/resource.class.php | 2 +-
mod/scorm/index.php | 2 +-
mod/scorm/player.php | 4 ++--
mod/scorm/report.php | 6 +++---
mod/scorm/view.php | 2 +-
mod/survey/index.php | 2 +-
mod/survey/report.php | 2 +-
mod/survey/save.php | 2 +-
mod/survey/view.php | 2 +-
mod/wiki/admin.php | 2 +-
mod/wiki/index.php | 2 +-
mod/wiki/view.php | 2 +-
mod/workshop/assess.php | 2 +-
mod/workshop/assessments.php | 2 +-
mod/workshop/index.php | 2 +-
mod/workshop/submissions.php | 2 +-
mod/workshop/upload.php | 2 +-
mod/workshop/view.php | 2 +-
mod/workshop/viewassessment.php | 2 +-
87 files changed, 107 insertions(+), 108 deletions(-)
diff --git a/course/mod.php b/course/mod.php
index 548fde2571..5e33df4913 100644
--- 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 1ff7e9b87f..ed9d7f6e24 100644
--- 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 c569b67781..3b2998b45c 100644
--- 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 a173d8e5f9..076639822b 100644
--- 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 9d4b5d4b0b..a133017f31 100644
--- 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 e7c4760f5c..80044c7137 100644
--- 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 55df4997b1..bb720ce0d3 100644
--- 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 bfbf9413ad..4813a20ed9 100644
--- 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 77dc4314bb..1db9e4737e 100644
--- 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 bba22546e5..48e9e5dc4f 100644
--- 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 387fdaf3d8..f047d52f6d 100644
--- 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 d403eff4ad..194ec8acd9 100755
--- 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 9b0ce5b6da..9b0f7416aa 100644
--- 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 f97af27896..bae831f912 100755
--- 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 739497d5fe..b6859af1f4 100755
--- 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 5a694aef70..f39975f364 100755
--- 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 2183b0eb70..e608dae70e 100755
--- 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 f28a7b7f23..bae0ca5ba3 100755
--- 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 5985b2fa37..12884d4ea6 100644
--- 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 edc48b4c7b..dd92c4bca8 100644
--- 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 7f12018c98..8698a8812c 100644
--- 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 e7632e0182..491bf49231 100644
--- 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 f4a9d1c29a..8f073107fb 100644
--- 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 400b1a3055..005d1bd381 100644
--- 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 38a38c6564..4d5d97c795 100644
--- 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 3fff3ddbc9..11b6512994 100644
--- 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 cfc4ca36bb..286c330f72 100644
--- 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 76c416394f..bd2e13993c 100644
--- 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 81f4864c13..cea87415de 100644
--- 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 2a856986c4..995871556d 100644
--- 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 f8a98c86f6..0109fd3056 100644
--- 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 adf67daa0c..e3aae64ff5 100644
--- 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 cb11bc83bb..c57f82b3c3 100644
--- 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 5f13dfb085..0a7b8430aa 100644
--- 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 3f5994472e..e09510fe8f 100644
--- 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 0f1180e6e2..1830f9a98d 100644
--- 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 13c2228dc6..66bbe8478b 100644
--- 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 9c207c7594..723956609b 100644
--- 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 003613d913..484452d92e 100644
--- 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 0213ecefae..2eef92d8de 100644
--- 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 4ef0c49747..4d3b21f4c5 100644
--- 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 f17f5b6f89..e516c3f635 100644
--- 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 dd74a706de..6ab5512973 100644
--- 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 7eae747575..0f90eef231 100644
--- 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 faf07c2158..e80f3dcfc1 100644
--- 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 bdb77f5c92..d31f25ec48 100644
--- 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 578049f8a3..eb399ae4a9 100644
--- 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 4197aec39f..9d2f3b4778 100644
--- 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 7fe8668745..27ad00e81c 100644
--- 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 c5de71b197..b7ec1bd177 100644
--- 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 3984042bb3..1ab7eeb811 100644
--- 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 4fe6dc1ebd..5a2dd4714c 100644
--- 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 f897cda414..98fdfe0a82 100644
--- 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 4aa26e29db..fb057f1a87 100644
--- 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 ddc567a267..eb61157e84 100644
--- 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 8e536542ae..859ca26bb8 100644
--- 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 0e0d777af9..5626f32872 100644
--- 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 14a193eeae..37c71300be 100644
--- 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 23042a12f9..c25eec2468 100644
--- 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 eeee9f3d43..30a99d12b3 100644
--- 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 ca5b0e07c9..f59fccf6c4 100644
--- 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 f0de1dd24e..9e83fff678 100644
--- 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 f7de1287e3..e4ef54622d 100644
--- 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 f7241cbed7..a1437a0db5 100644
--- 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 7133efc690..6d9d3b6263 100644
--- 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 2610257176..c41e7b5b32 100644
--- 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 8f26e2dcc3..96072862e9 100644
--- 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 2cee64a7aa..930fb37505 100644
--- 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 baef7b1b5c..6c2af43e79 100644
--- 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 49b484a37c..e4d378e713 100755
--- 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 8bbf656fbd..d4c6e91c90 100755
--- 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 d3136c8e39..cb543202c9 100755
--- 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 cd913c134b..5e8e64f631 100755
--- 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 b8238ee919..b078f0241e 100644
--- 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 1d7e49a151..cced689e57 100644
--- 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 25f075b7e8..141fc9328f 100644
--- 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 583f61e895..ee7bc86c00 100644
--- 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 cffc52eebe..65228b22a3 100644
--- 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 ccb6cb4dde..9d1c18aa2f 100644
--- 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 a4f576d7bb..ed09038a74 100644
--- 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 f4cfebec09..ee9cb83595 100644
--- 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 e2150838ba..88ca8ec6e1 100644
--- 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 09f3374b64..4e11a27113 100644
--- 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 cdb028049e..916fe510b9 100644
--- 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 3b880aa347..ae131f9777 100644
--- 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 8cca3b6d94..18d89f3156 100644
--- 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 7ea7d29171..8ef0f89994 100644
--- 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,
--
2.39.5