diff options
| author | Evan Prodromou <evan@controlezvous.ca> | 2008-06-24 00:05:48 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlezvous.ca> | 2008-06-24 00:05:48 -0400 |
| commit | 836f5bb756f51e3927d106e6d23eba4d5c237576 (patch) | |
| tree | 6bdafd95690f994800531f7c5394c535d7b0ac9c /actions/login.php | |
| parent | 5650d698bed8351f4f9c86b615ae89184cec8e94 (diff) | |
login doesn't bark if the user is automatically logged in
darcs-hash:20080624040548-34904-3b5a78f4ed40db913c82e90fe6955f26aac0f92a.gz
Diffstat (limited to 'actions/login.php')
| -rw-r--r-- | actions/login.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actions/login.php b/actions/login.php index fe2ae5c1c..3919b4f7e 100644 --- a/actions/login.php +++ b/actions/login.php @@ -23,7 +23,7 @@ class LoginAction extends Action { function handle($args) { parent::handle($args); - if (common_logged_in()) { + if (common_is_real_login()) { common_user_error(_t('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->check_login(); @@ -71,18 +71,18 @@ class LoginAction extends Action { common_input('nickname', _t('Nickname')); common_password('password', _t('Password')); common_checkbox('rememberme', _t('Remember me'), - _t('Automatically login in the future; ' . + _t('Automatically login in the future; ' . 'not for shared computers!')); common_submit('submit', _t('Login')); common_element_end('form'); common_show_footer(); } - + function show_top($error=NULL) { if ($error) { common_element('p', 'error', $error); } else { - common_element('p', 'instructions', + common_element('p', 'instructions', _t('Login with your username and password. ' . 'Don\'t have a username yet? Choose register above. ')); } |