From e5c53c8a5c3f3bc77f58838081dcb82f6c758e0c Mon Sep 17 00:00:00 2001
From: fisharebest <fisharebest@gmail.com>
Date: Fri, 29 Oct 2010 11:00:37 +0000
Subject: #667699 - Wrong login URL in FAB and Colors theme svn 9719

---
 themes/colors/header.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'themes/colors')

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.'&amp;logout=');
-				echo '<li><a class="icon_color" href="', $LOGIN_URL, '?url=', WT_SCRIPT_PATH, WT_SCRIPT_NAME, decode_url(normalize_query_string($QUERY_STRING.'&amp;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();
-- 
cgit v1.3