From 72b3485eabc628d5af7515fbf563df184f8450e7 Mon Sep 17 00:00:00 2001
From: samhemelryk <samhemelryk>
Date: Wed, 2 Sep 2009 07:08:33 +0000
Subject: [PATCH] navigation MDL-14632 Fixed navbar bug whereby if no active
 pages were found in either navigation or settings `home` was not added to the
 navbar

---
 lib/navigationlib.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index b6d2a1b107..dd00b31093 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -1860,8 +1860,9 @@ class navbar extends navigation_node {
         } else if ($this->page->settingsnav->contains_active_node()) {
             // Parse the settings navigation to get the active node
             $output .= $this->parse_branch_to_html($this->page->settingsnav->children, true, $customchildren);
+        } else {
+            $output .= $this->parse_branch_to_html($this, true, $customchildren);
         }
-
         // Check if there are any children added by code
         if ($customchildren) {
             // Add the custom children
@@ -1887,6 +1888,7 @@ class navbar extends navigation_node {
             $output .= '<li class="first">'.parent::content(true).'</li>';
         }
         $count = 0;
+        if (!is_array($navarray)) return $output;
         // Iterate the navarray and display each node
         while (count($navarray)>0) {
             // Sanity check make sure we don't display WAY too much information
-- 
2.39.5