Merge ActivitySpam plugin

[quix0rs-gnu-social.git] / actions / login.php

diff --git a/actions/login.php b/actions/login.php
index f774a0ed80d1f11bc7f29a9b71b0a12abe45cbe2..f8a1a5c6a3ef19be79942f91fe87f1537cff7aed 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -94,8 +94,8 @@ class LoginAction extends Action
         parent::handle($args);
 
         if (common_is_real_login()) {
-            // TRANS: Client error displayed when trying to log in while already logged in.
-            $this->clientError(_('Already logged in.'));
+            $user = common_current_user();
+            common_redirect(common_local_url('all', array('nickname' => $user->nickname)), 307);
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->checkLogin();
         } else {