mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

navigation MDL-22195 Fixed issue with duplicate nodes debug message for modules.

Browse Source
This commit is contained in:
Sam Hemelryk 2010-04-27 03:06:42 +00:00
parent 3419829a7a
commit 91eab03d10
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/navigationlib.php
View File

@ -883,11 +883,11 @@ class global_navigation extends navigation_node {
// Load all of the section activities for the section the cm belongs to. // Load all of the section activities for the section the cm belongs to.
$activities = $this->load_section_activities($sections[$cm->sectionnumber]->sectionnode, $cm->sectionnumber, get_fast_modinfo($course)); $activities = $this->load_section_activities($sections[$cm->sectionnumber]->sectionnode, $cm->sectionnumber, get_fast_modinfo($course));
// Finally load the cm specific navigaton information
} else { } else {
$activities = array(); $activities = array();
$activities[$cm->id] = $coursenode->get($cm->id, navigation_node::TYPE_ACTIVITY); $activities[$cm->id] = $coursenode->get($cm->id, navigation_node::TYPE_ACTIVITY);
} }
// Finally load the cm specific navigaton information
$this->load_activity($cm, $course, $activities[$cm->id]); $this->load_activity($cm, $course, $activities[$cm->id]);
// And make the activity node active. // And make the activity node active.
$activities[$cm->id]->make_active(); $activities[$cm->id]->make_active();
@ -1086,7 +1086,7 @@ class global_navigation extends navigation_node {
$sectionnode = $coursenode->add($sectionname, $url, navigation_node::TYPE_SECTION, null, $section->id); $sectionnode = $coursenode->add($sectionname, $url, navigation_node::TYPE_SECTION, null, $section->id);
$sectionnode->nodetype = navigation_node::NODETYPE_BRANCH; $sectionnode->nodetype = navigation_node::NODETYPE_BRANCH;
$sectionnode->hidden = (!$section->visible); $sectionnode->hidden = (!$section->visible);
if ($sectionnode->isactive || ($activesection != null && $section->section == $activesection)) { if ($this->page->context->contextlevel != CONTEXT_MODULE && ($sectionnode->isactive || ($activesection != null && $section->section == $activesection))) {
$sectionnode->force_open(); $sectionnode->force_open();
$this->load_section_activities($sectionnode, $section->section, $modinfo); $this->load_section_activities($sectionnode, $section->section, $modinfo);
} }