diff --git a/lang/en_US.php b/lang/en_US.php index 6707ec193..325dd0ed5 100644 --- a/lang/en_US.php +++ b/lang/en_US.php @@ -609,9 +609,8 @@ $lang['en_US']['SearchForm']['GO'] = 'Go'; $lang['en_US']['SearchForm']['SEARCH'] = 'Search'; $lang['en_US']['SearchForm']['SearchResults'] = 'Search Results'; $lang['en_US']['Security']['ALREADYLOGGEDIN'] = array( - 'You don\'t have access to this page. If you have another account that can access that page, you can log in again.', - PR_MEDIUM, - '%s will be replaced with a link to log in.' + 'You don\'t have access to this page. If you have another account that can access that page, you can log in again below.', + PR_MEDIUM ); $lang['en_US']['Security']['BUTTONSEND'] = 'Send me the password reset link'; $lang['en_US']['Security']['CHANGEPASSWORDBELOW'] = 'You can change your password below.'; @@ -874,4 +873,4 @@ $lang['en_US']['WidgetArea']['SINGULARNAME'] = array( 'Singular name of the object, used in dropdowns and to generally identify a single object in the interface' ); -?> \ No newline at end of file +?> diff --git a/security/Security.php b/security/Security.php index 40640a26b..5820bc700 100644 --- a/security/Security.php +++ b/security/Security.php @@ -173,7 +173,7 @@ class Security extends Controller { 'alreadyLoggedIn' => _t( 'Security.ALREADYLOGGEDIN', "You don't have access to this page. If you have another account that " - . "can access that page, you can log in again.", + . "can access that page, you can log in again below.", PR_MEDIUM, "%s will be replaced with a link to log in." ), @@ -202,12 +202,14 @@ class Security extends Controller { else $message=$messageSet['default']; - // Replace %s with the log in link - $body = sprintf($message, - Controller::join_links(Director::baseURL(), 'Security/login', - '?BackURL=' . urlencode($_SERVER['REQUEST_URI']))); + // Somewhat hackish way to render a login form with an error message. + $me = new Security(); + $form = $me->LoginForm(); + $form->sessionMessage($message, 'warning'); + Session::set('MemberLoginForm.force_message',1); + $formText = $me->login(); - $response->setBody($body); + $response->setBody($formText); return $response; } else if(substr(Director::history(),0,15) == 'Security/logout') {