Merge branch 'uiredesign' of ../evan into uiredesign

1 files changed, 4 insertions, 4 deletions

diff --git a/actions/login.php b/actions/login.php
index f43de31ff..5226458fb 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -31,7 +31,7 @@ class LoginAction extends Action
     {
         parent::handle($args);
         if (common_is_real_login()) {
-            common_user_error(_('Already logged in.'));
+            $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->check_login();
         } else {
@@ -46,7 +46,7 @@ class LoginAction extends Action
         # CSRF protection - token set in common_notice_form()
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
-            $this->client_error(_('There was a problem with your session token. Try again, please.'));
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
             return;
         }
 
@@ -55,7 +55,7 @@ class LoginAction extends Action
         if (common_check_user($nickname, $password)) {
             # success!
             if (!common_set_user($nickname)) {
-                common_server_error(_('Error setting user.'));
+                $this->serverError(_('Error setting user.'));
                 return;
             }
             common_real_login(true);
@@ -81,7 +81,7 @@ class LoginAction extends Action
 
         # success!
         if (!common_set_user($user)) {
-            common_server_error(_('Error setting user.'));
+            $this->serverError(_('Error setting user.'));
             return;
         }