From 7f08759357dd0f4c2fb059fbc3ecbdff42738a05 Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Wed, 22 Dec 2010 11:12:44 +0000
Subject: [PATCH] bug 2078: Links must not be displayed in menubar if empty.

git-svn-id: http://piwigo.org/svn/branches/2.1@8222 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/menubar.inc.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/menubar.inc.php b/include/menubar.inc.php
index 133aab6ec..add259460 100644
--- a/include/menubar.inc.php
+++ b/include/menubar.inc.php
@@ -41,7 +41,7 @@ function initialize_menu()
 //--------------------------------------------------------------- external links
   if ( ($block=$menu->get_block('mbLinks')) and !empty($conf['links']) )
   {
-    $data = array();
+    $block->data = array();
     foreach ($conf['links'] as $url => $url_data)
     {
       if (!is_array($url_data))
@@ -69,11 +69,13 @@ function initialize_menu()
               'FEATURES' => (isset($url_data['nw_features']) ? $url_data['nw_features'] : '')
             );
         }
-        $data[] = $tpl_var;
+        $block->data[] = $tpl_var;
       }
     }
-    $block->template = 'menubar_links.tpl';
-    $block->data = $data;
+    if ( !empty($block->data) )
+    {
+      $block->template = 'menubar_links.tpl';
+    }
   }
 
 //-------------------------------------------------------------- categories