L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-12676 - generate navigation if none supplied to print_header_simple()

Browse Source 
Merged from MOODLE_19_STABLE, also merged unmerged change from MDL-11812
This commit is contained in:
poltawski
2007-12-20 15:52:33 +00:00
parent b92adb865a
commit 5dc1e0bebb
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/weblib.php
+7 -2
View File
@@ -2749,6 +2749,11 @@ function print_header_simple($title='', $heading='', $navigation='', $focus='',
global $COURSE, $CFG;
// if we have no navigation specified, build it
if( empty($navigation) ){
$navigation = build_navigation('');
}
// If old style nav prepend course short name otherwise leave $navigation object alone
if (!is_newnav($navigation)) {
if ($COURSE->id != SITEID) {
@@ -3654,7 +3659,7 @@ function build_navigation($extranavlinks, $cm = null) {
if (is_object($cm)) {
if (!isset($cm->modname)) {
debugging('The field $cm->modname should be set if you call build_navigation with '.
'a $cm parameter. If you get $cm using get_coursemodule_from_instance or ',
'a $cm parameter. If you get $cm using get_coursemodule_from_instance or '.
'get_coursemodule_from_id, this will be done automatically.', DEBUG_DEVELOPER);
if (!$cm->modname = get_field('modules', 'name', 'id', $cm->module)) {
error('Cannot get the module type in build navigation.');
@@ -3662,7 +3667,7 @@ function build_navigation($extranavlinks, $cm = null) {
}
if (!isset($cm->name)) {
debugging('The field $cm->name should be set if you call build_navigation with '.
'a $cm parameter. If you get $cm using get_coursemodule_from_instance or ',
'a $cm parameter. If you get $cm using get_coursemodule_from_instance or '.
'get_coursemodule_from_id, this will be done automatically.', DEBUG_DEVELOPER);
if (!$cm->name = get_field($cm->modname, 'name', 'id', $cm->instance)) {
error('Cannot get the module name in build navigation.');