diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/clouds/header.php | 5 | ||||
| -rw-r--r-- | themes/colors/header.php | 5 | ||||
| -rw-r--r-- | themes/fab/header.php | 5 | ||||
| -rw-r--r-- | themes/webtrees/header.php | 11 | ||||
| -rw-r--r-- | themes/xenea/header.php | 7 |
5 files changed, 25 insertions, 8 deletions
diff --git a/themes/clouds/header.php b/themes/clouds/header.php index cf88c22438..94825cc338 100644 --- a/themes/clouds/header.php +++ b/themes/clouds/header.php @@ -195,7 +195,10 @@ echo '<table id="toplinks">', echo '<div style="float:', WT_CSS_REVERSE_ALIGN, ';"><ul class="makeMenu">'; echo MenuBar::getFavoritesMenu()->getMenuAsList(); global $ALLOW_THEME_DROPDOWN; - echo ' | ', MenuBar::getLanguageMenu()->getMenuAsList(); + $language_menu=MenuBar::getLanguageMenu(); + if ($language_menu) { + echo ' | ', $language_menu->getMenuAsList(); + } if ($ALLOW_THEME_DROPDOWN && get_site_setting('ALLOW_USER_THEMES')) { echo ' | ', MenuBar::getThemeMenu()->getMenuAsList(); } diff --git a/themes/colors/header.php b/themes/colors/header.php index 57d0a4fe48..eab5123e76 100644 --- a/themes/colors/header.php +++ b/themes/colors/header.php @@ -137,7 +137,10 @@ if ($view!='simple') { } } echo '<span class="link"> | ', MenuBar::getFavoritesMenu()->getMenuAsList(); - echo ' | ', MenuBar::getLanguageMenu()->getMenuAsList(); + $language_menu=MenuBar::getLanguageMenu(); + if ($language_menu) { + echo ' | ', $language_menu->getMenuAsList(); + } global $ALLOW_THEME_DROPDOWN; if ($ALLOW_THEME_DROPDOWN && get_site_setting('ALLOW_USER_THEMES')) { echo ' | ', MenuBar::getThemeMenu()->getMenuAsList(); diff --git a/themes/fab/header.php b/themes/fab/header.php index 090bc6fa82..8c0c084b96 100644 --- a/themes/fab/header.php +++ b/themes/fab/header.php @@ -122,7 +122,10 @@ if ($view!='simple') { } } echo '<span class="link"> | ', MenuBar::getFavoritesMenu()->getMenuAsList(); - echo ' | ', MenuBar::getLanguageMenu()->getMenuAsList(); + $language_menu=MenuBar::getLanguageMenu(); + if ($language_menu) { + echo ' | ', $language_menu->getMenuAsList(); + } global $ALLOW_THEME_DROPDOWN; if ($ALLOW_THEME_DROPDOWN && get_site_setting('ALLOW_USER_THEMES')) { echo ' | ', MenuBar::getThemeMenu()->getMenuAsList(); diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php index 537e0d23d1..27b6bc21b0 100644 --- a/themes/webtrees/header.php +++ b/themes/webtrees/header.php @@ -102,10 +102,13 @@ if ($view!='simple') { '<ul class="makeMenu" align="', $TEXT_DIRECTION=="rtl"?"left":"right", '" >'; echo MenuBar::getFavoritesMenu()->getMenuAsList(); global $ALLOW_THEME_DROPDOWN; - if ($ALLOW_THEME_DROPDOWN && get_site_setting('ALLOW_USER_THEMES')) { - echo ' | ', MenuBar::getThemeMenu()->getMenuAsList(); - } - echo ' | ', MenuBar::getLanguageMenu()->getMenuAsList(); + if ($ALLOW_THEME_DROPDOWN && get_site_setting('ALLOW_USER_THEMES')) { + echo ' | ', MenuBar::getThemeMenu()->getMenuAsList(); + } + $language_menu=MenuBar::getLanguageMenu(); + if ($language_menu) { + echo ' | ', $language_menu->getMenuAsList(); + } echo ' </ul>', '</div>', '</td>', diff --git a/themes/xenea/header.php b/themes/xenea/header.php index aafbbb650c..f64f187694 100644 --- a/themes/xenea/header.php +++ b/themes/xenea/header.php @@ -126,7 +126,12 @@ $displayDate=timestamp_to_gedcom_date(client_time())->Display(false, $DATE_FORMA <td width="115"><div id="favtheme" align="<?php echo $TEXT_DIRECTION=="rtl"?"right":"left" ?>" class="blanco"><?php print_theme_dropdown(1); ?><?php print_favorite_selector(1); ?></div></td> <td><div align="center"><?php print_user_links(); ?></div></td> <td width="120" align="<?php echo $TEXT_DIRECTION=="rtl"?"left":"right" ?>" > - <div class="makeMenu"><?php echo MenuBar::getLanguageMenu()->getMenuAsList();?></div> + <div class="makeMenu"><?php + $language_menu=MenuBar::getLanguageMenu(); + if ($language_menu) { + echo $language_menu->getMenuAsList(); + } + ?></div> <div id="favdate" class="blanco" align="right" ><?php echo $displayDate; ?></div> </td> <td width="10"><img src="<?php echo WT_THEME_DIR; ?>images/pixel.gif" width="1" height="1" alt="" /></td></tr></table> |