diff options
Diffstat (limited to 'actions/login.php')
| -rw-r--r-- | actions/login.php | 19 |
1 files changed, 4 insertions, 15 deletions
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) { |