MDL-48070 navbar: ensure navigation initialised
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 20:55:36 +0000 (09:55 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 20:55:36 +0000 (09:55 +1300)
lib/navigationlib.php

index eb6661f..11e289c 100644 (file)
@@ -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();