From 653637402f613b5d4bc9802f59ff2b13571a0388 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 19 Nov 2011 07:59:33 -0500
Subject: Fixes #4102 handling no menu items for site menu

---
 views/default/navigation/menu/site.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'views/default/navigation')

diff --git a/views/default/navigation/menu/site.php b/views/default/navigation/menu/site.php
index 38b42bda9..24c21dd57 100644
--- a/views/default/navigation/menu/site.php
+++ b/views/default/navigation/menu/site.php
@@ -6,12 +6,15 @@
  * @uses $vars['menu']['more']
  */
 
+$default_items = elgg_extract('default', $vars['menu'], array());
+$more_items = elgg_extract('more', $vars['menu'], array());
+
 echo '<ul class="elgg-menu elgg-menu-site elgg-menu-site-default clearfix">';
-foreach ($vars['menu']['default'] as $menu_item) {
+foreach ($default_items as $menu_item) {
 	echo elgg_view('navigation/menu/elements/item', array('item' => $menu_item));
 }
 
-if (isset($vars['menu']['more']) && !empty($vars['menu']['more'])) {
+if ($more_items) {
 	echo '<li class="elgg-more">';
 
 	$more = elgg_echo('more');
@@ -19,7 +22,7 @@ if (isset($vars['menu']['more']) && !empty($vars['menu']['more'])) {
 	
 	echo elgg_view('navigation/menu/elements/section', array(
 		'class' => 'elgg-menu elgg-menu-site elgg-menu-site-more', 
-		'items' => $vars['menu']['more'],
+		'items' => $more_items,
 	));
 	
 	echo '</li>';
-- 
cgit v1.2.3