From 9a44acd27b0f8fb63cd07af7e7232f6c2b29ecf5 Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 21 Sep 2011 20:57:33 -0400 Subject: Fixes #3770 CSS only site menu that works in IE7 --- views/default/navigation/menu/site.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'views/default/navigation') diff --git a/views/default/navigation/menu/site.php b/views/default/navigation/menu/site.php index 1409f54af..e2d3aa8fa 100644 --- a/views/default/navigation/menu/site.php +++ b/views/default/navigation/menu/site.php @@ -15,7 +15,7 @@ if (isset($vars['menu']['more'])) { echo '
  • '; $more = elgg_echo('more'); - echo "$more"; + echo "$more"; echo elgg_view('navigation/menu/elements/section', array( 'class' => 'elgg-menu elgg-menu-site elgg-menu-site-more', -- cgit v1.2.3 From 33d791bee34f1b2d5ae6b0c8e184c4bb1c00bc1a Mon Sep 17 00:00:00 2001 From: cash 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 'views/default/navigation') 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 '
  • '; $more = elgg_echo('more'); -- cgit v1.2.3