GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

better description of what happens when changing settings 

darcs-hash:20080709050022-84dde-b8b583c8d2c67bcf6bbe86b2ff26eec7af345d72.gz
This commit is contained in:
Evan Prodromou 2008-07-09 01:00:22 -04:00
parent d6c2bd51c5
commit c7f5076906
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
actions/login.php
View File

@ -84,10 +84,21 @@ class LoginAction extends Action {
}
function get_instructions() {
return _t('Login with your username and password. ' .
'Don\'t have a username yet? ' .
'[Register](%%action.register%%) a new account, or ' .
'try [OpenID](%%action.openidlogin%%). ');
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 _t('To change your settings, login with your ' .
'user name and password ' .
'(or use [OpenID](%%action.openidlogin%%)).');
} else {
return _t('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) {