Fixes #3876 fixed dangling more site menu when items are manually selected - thanks...

diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index 0e9ec1c1798b398bb466367ea974b00c3632d27c..27af26be24727325bfc17642cfec64308c9ea1a1 100644 (file)
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -285,7 +285,9 @@ function elgg_site_menu_setup($hook, $type, $return, $params) {
                }
 
                $return['default'] = $featured;
-               $return['more'] = $registered;
+               if (count($registered) > 0) {
+                       $return['more'] = $registered;
+               }
        } else {
                // no featured menu items set
                $max_display_items = 5;

diff --git a/views/default/navigation/menu/site.php b/views/default/navigation/menu/site.php
index e2d3aa8fab1462afca4d2503958bbfaf5398b268..38b42bda921f935c3e43e4cc84f20930395ce8cf 100644 (file)
--- a/views/default/navigation/menu/site.php
+++ b/views/default/navigation/menu/site.php
@@ -11,7 +11,7 @@ foreach ($vars['menu']['default'] as $menu_item) {
        echo elgg_view('navigation/menu/elements/item', array('item' => $menu_item));
 }
 
-if (isset($vars['menu']['more'])) {
+if (isset($vars['menu']['more']) && !empty($vars['menu']['more'])) {
        echo '<li class="elgg-more">';
 
        $more = elgg_echo('more');