Merge branch '48070-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Nov 2014 02:41:28 +0000 (03:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Nov 2014 02:41:28 +0000 (03:41 +0100)
lib/navigationlib.php

index c11e457..c0c33c2 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();