diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-10-29 11:00:37 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-10-29 11:00:37 +0000 |
| commit | e5c53c8a5c3f3bc77f58838081dcb82f6c758e0c (patch) | |
| tree | 79ae997d0a560146b23099fd42cf5fe634e43c25 /themes/colors | |
| parent | 5e08ca879e107da41794253148116ccb75598af2 (diff) | |
| download | webtrees-e5c53c8a5c3f3bc77f58838081dcb82f6c758e0c.tar.gz webtrees-e5c53c8a5c3f3bc77f58838081dcb82f6c758e0c.tar.bz2 webtrees-e5c53c8a5c3f3bc77f58838081dcb82f6c758e0c.zip | |
#667699 - Wrong login URL in FAB and Colors theme svn 9719
Diffstat (limited to 'themes/colors')
| -rw-r--r-- | themes/colors/header.php | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/themes/colors/header.php b/themes/colors/header.php index eab5123e76..53e2a38539 100644 --- a/themes/colors/header.php +++ b/themes/colors/header.php @@ -120,7 +120,7 @@ if ($view!='simple') { if (WT_USER_ID) { echo '<li><a href="edituser.php" class="icon_color">', getUserFullName(WT_USER_ID), '</a></li>', - ' | <li><a href="index.php?logout=1" class="icon_color">', i18n::translate('Logout'), '</a></li>'; + ' | <li class="icon_color">', logout_link(), '</li>'; if (WT_USER_GEDCOM_ADMIN) { echo ' | <li><a href="admin.php" class="icon_color">', i18n::translate('Administration'), '</a></li>'; } @@ -128,13 +128,7 @@ if ($view!='simple') { echo ' | <li><a href="javascript:;" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', i18n::translate('Pending Changes'), '</a></li>'; } } else { - $LOGIN_URL=get_site_setting('LOGIN_URL'); - if (WT_SCRIPT_NAME==$LOGIN_URL) { - echo '<li><a class="icon_color" href="', $LOGIN_URL, '">', i18n::translate('Login'), '</a></li>'; - } else { - $QUERY_STRING = normalize_query_string($QUERY_STRING.'&logout='); - echo '<li><a class="icon_color" href="', $LOGIN_URL, '?url=', WT_SCRIPT_PATH, WT_SCRIPT_NAME, decode_url(normalize_query_string($QUERY_STRING.'&ged='.WT_GEDCOM)), '">', i18n::translate('Login'), '</a></li>'; - } + echo '<li class="icon_color">', login_link(), '</li>'; } echo '<span class="link"> | ', MenuBar::getFavoritesMenu()->getMenuAsList(); $language_menu=MenuBar::getLanguageMenu(); |