Fixes #4102 handling no menu items for site menu

diff --git a/views/default/navigation/menu/site.php b/views/default/navigation/menu/site.php
index 38b42bda921f935c3e43e4cc84f20930395ce8cf..24c21dd57a85e34f1158173bd916b7765d9353c7 100644 (file)
--- 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>';