archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug 2078: Links must not be displayed in menubar if empty.

Browse source 
git-svn-id: http://piwigo.org/svn/branches/2.1@8222 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2010-12-22 11:12:44 +00:00
parent 8dad5f459f
commit 7f08759357
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/menubar.inc.php
View file

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