Merge branch '48070-29' of git://github.com/samhemelryk/moodle

2014-11-18 03:41:28 +01:00
parent 5b9a75e1fe 699f60c6f7
commit ea1720be99
1 changed files with 3 additions and 0 deletions
@@ -3152,6 +3152,9 @@ class navbar extends navigation_node {

        // Check if navigation contains the active node
        if (!$this->ignoreactive) {
+            // We will need to ensure the navigation has been initialised.
+            $this->page->navigation->initialise($this->page);
+            // Now find the active nodes on both the navigation and settings.
            $navigationactivenode = $this->page->navigation->find_active_node();
            $settingsactivenode = $this->page->settingsnav->find_active_node();