Merge branch 'wip-MDL-35276-master' of git://github.com/marinaglancy/moodle

2012-09-26 15:50:56 +12:00
parent c89613edaa 923451c59f
commit 4aede312e7
6 changed files with 71 additions and 67 deletions
@@ -2027,9 +2027,7 @@ class global_navigation extends navigation_node {
                    // pre 2.3 style format url
                    $url = $urlfunction($course->id, $section->section);
                }else{
-                    if ($course->coursedisplay == COURSE_DISPLAY_MULTIPAGE) {
-                        $url = course_get_url($course, $section->section);
-                    }
+                    $url = course_get_url($course, $section->section, array('navigation' => true));
                }
                $sectionnode = $coursenode->add($sectionname, $url, navigation_node::TYPE_SECTION, null, $section->id);
                $sectionnode->nodetype = navigation_node::NODETYPE_BRANCH;