From 710b17aa37dd5c90db695219defdfef7a889f29a Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Wed, 14 Sep 2011 21:09:48 -0400
Subject: Fixes #3681 fixed Utilities menu collisions in admin section and
 added documentation about registering more than one menu item with the same
 name to a menu

---
 engine/lib/navigation.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engine/lib/navigation.php')

diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index cefe40ecf..0e9ec1c17 100644
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -53,6 +53,9 @@
  * 'register', 'menu:<menu_name>'. If you do, you may end up with many incorrect
  * links on a context-sensitive menu.
  *
+ * @warning A menu item's name must be unique per menu. If more than one menu
+ * item with the same name are registered, the last menu item takes priority.
+ *
  * @see elgg_view_menu() for the plugin hooks available for modifying a menu as
  * it is being rendered.
  *
-- 
cgit v1.2.3


From 33d791bee34f1b2d5ae6b0c8e184c4bb1c00bc1a Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sun, 25 Sep 2011 17:39:37 -0400
Subject: Fixes #3876 fixed dangling more site menu when items are manually
 selected - thanks to JEBailey

---
 engine/lib/navigation.php              | 4 +++-
 views/default/navigation/menu/site.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'engine/lib/navigation.php')

diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index 0e9ec1c17..27af26be2 100644
--- 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 e2d3aa8fa..38b42bda9 100644
--- 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');
-- 
cgit v1.2.3