login doesn't bark if the user is automatically logged in

darcs-hash:20080624040548-34904-3b5a78f4ed40db913c82e90fe6955f26aac0f92a.gz

diff --git a/actions/login.php b/actions/login.php
index fe2ae5c1c459a3b2b72108c3f9812b55698cb54d..3919b4f7e710c31cd28453a4ac7262313f4e9856 100644 (file)
--- 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. '));
                }