Merge branch 'wip-MDL-40174-m26' of git://github.com/samhemelryk/moodle

2013-07-22 16:00:41 +08:00
parent 7a3f9421cb 75eb202ebd
commit bbc8485708
1 changed files with 2 additions and 1 deletions
@@ -1266,7 +1266,8 @@ class global_navigation extends navigation_node {
        // Remove any empty root nodes
        foreach ($this->rootnodes as $node) {
            // Dont remove the home node
-            if ($node->key !== 'home' && !$node->has_children()) {
+            /** @var navigation_node $node */
+            if ($node->key !== 'home' && !$node->has_children() && !$node->isactive) {
                $node->remove();
            }
        }