Skip to content
Permalink
Browse files

merge r8222 from branch 2.1 to trunk

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

git-svn-id: http://piwigo.org/svn/trunk@8223 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information...
patdenice
patdenice committed Dec 22, 2010
1 parent 709515b commit 195c0b47730708f6cb4b1506d0f432565a762ef1
Showing with 6 additions and 4 deletions.
  1. +6 −4 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

0 comments on commit 195c0b4

Please sign in to comment.
You can’t perform that action at this time.