From 834c21b2aaf78da1081416d05098286e9bf17c2a Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Sun, 13 Jul 2008 00:46:08 -0400 Subject: Merge some gettext strings to one line so translation tools are happier darcs-hash:20080713044608-533db-ee16aecee9b6d82b22ce6a25f6a9573c23eee9f8.gz --- actions/login.php | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'actions/login.php') diff --git a/actions/login.php b/actions/login.php index 0f2dec1a4..003d6613f 100644 --- a/actions/login.php +++ b/actions/login.php @@ -109,21 +109,10 @@ class LoginAction extends Action { } function get_instructions() { - if (common_logged_in() && - !common_is_real_login() && - common_get_returnto()) - { - # rememberme logins have to reauthenticate before - # changing any profile settings (cookie-stealing protection) - return _('For security reasons, please re-enter your ' . - 'user name and password ' . - 'before changing your settings.'); - } else { - return _('Login with your username and password. ' . - 'Don\'t have a username yet? ' . - '[Register](%%action.register%%) a new account, or ' . - 'try [OpenID](%%action.openidlogin%%). '); - } + return _('Login with your username and password. ' . + 'Don\'t have a username yet? ' . + '[Register](%%action.register%%) a new account, or ' . + 'try [OpenID](%%action.openidlogin%%). '); } function show_top($error=NULL) { -- cgit v1.2.3-54-g00ecf