From ec4b04ae8288b33c9cb642eefca7dddddda67847 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 15 May 2007 17:14:25 +0000 Subject: [PATCH] The message shouldn't be displayed at all(now), unless there's foul play invlolved. #10968 git-svn-id: file:///svn/phpbb/trunk@7592 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/en/ucp.php | 2 +- phpBB/ucp.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index e4b8f9476f..4174330d5c 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -228,7 +228,7 @@ $lang = array_merge($lang, array( 'LINK_REMOTE_SIZE_EXPLAIN' => 'Specify the width and height of the avatar, leave blank to attempt automatic verification.', 'LOGIN_EXPLAIN_UCP' => 'Please login in order to access the User Control Panel.', 'LOGIN_REDIRECT' => 'You have been successfully logged in.', - 'LOGOUT_FAILED' => 'You were not logged out, as the request did not match your session.', + 'LOGOUT_FAILED' => 'You were not logged out, as the request did not match your session. Please contact the board administrator if you continue to experience problems.', 'LOGOUT_REDIRECT' => 'You have been successfully logged out.', 'MARK_IMPORTANT' => 'Mark/Unmark as important', diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 923a974b92..c1b9504112 100755 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -90,7 +90,7 @@ switch ($mode) } else { - $message = $user->lang['LOGOUT_FAILED']; + $message = ($user->data['user_id'] == ANONYMOUS) ? $user->lang['LOGOUT_REDIRECT'] : $user->lang['LOGOUT_FAILED']; } meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));