From d0347bb98fe97368b34cc82b69ce3a3284193362 Mon Sep 17 00:00:00 2001
From: buttle <chris@gatopelao.org>
Date: Fri, 13 Feb 2015 16:26:41 +0100
Subject: [PATCH] Removing home stub if empty Added an Event HomeStubNavItems
 menu->subMenu() returns false if empty

---
 EVENTS.txt          |  9 +++++++++
 lib/homestubnav.php | 23 ++++++++++++-----------
 lib/menu.php        |  5 +++--
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index 197b8afe6f..66a86652e9 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1463,3 +1463,12 @@ StartNotifyMentioned: During notice distribution, we send notifications (email,
 EndNotifyMentioned: During notice distribution, we send notifications (email, im...) to the profiles who were somehow mentioned.
 - $stored:         Notice object that is being distributed.
 - $mentioned_ids:  Array of profile IDs (not just for local users) who got mentioned by the notice.
+
+StartHomeStubNavItems: Go back Home nav items. Default includes just one item 'home'
+- $action: action being executed (for output and params)
+- $items: array of items in the nav
+
+EndHomeStubNavItems:
+- $action: action being executed (for output and params)
+- $items: array of items in the nav
+
diff --git a/lib/homestubnav.php b/lib/homestubnav.php
index d22d1fd16c..64212f18aa 100644
--- a/lib/homestubnav.php
+++ b/lib/homestubnav.php
@@ -49,17 +49,18 @@ class HomeStubNav extends Menu
 {
     function getItems()
     {
-        if (Event::handle('StartHomeStubNav', array(&$this->action))) {
-            return array(array('top',
-                               array(),
-                               // TRANS: Menu item in personal group navigation menu.
-                               _m('MENU','Home'),
-                               // TRANS: Menu item title in personal group navigation menu.
-                               // TRANS: %s is a username.
-                               _('Back to top'),
-                               'nav_return_top'));
-            Event::handle('EndHomeStubNav', array(&$this->action));
+        $items = array();
+        if (Event::handle('StartHomeStubNavItems', array($this->action, &$items))) {
+            $items[] = array('top',
+                            array(),
+                            // TRANS: Menu item in personal group navigation menu.
+                            _m('MENU','Home'),
+                            // TRANS: Menu item title in personal group navigation menu.
+                            // TRANS: %s is a username.
+                            _('Back to top'),
+                            'nav_return_top');
+            Event::handle('EndHomeStubNavItems', array($this->action, &$items));
         }
-        return Null;
+        return $items;
     }
 }
diff --git a/lib/menu.php b/lib/menu.php
index 3d22ff4924..4baeb70d2f 100644
--- a/lib/menu.php
+++ b/lib/menu.php
@@ -150,8 +150,9 @@ class Menu extends Widget
 
     function submenu($label, $menu)
     {
-        if(!$menu->getItems())
-            return;
+        if (empty($menu->getItems())){
+            return false;
+        }
         $this->action->elementStart('li');
         $this->action->element('h3', null, $label);
         $menu->show();
-- 
2.39.5