Merge commit 'refs/merge-requests/159' of git://gitorious.org/statusnet/mainline into merge-requests/159

This commit is contained in:
Evan Prodromou 2011-09-21 16:31:38 -04:00
commit d594c83a5a

View File

@ -94,8 +94,7 @@ class LoginAction extends Action
parent::handle($args); parent::handle($args);
if (common_is_real_login()) { if (common_is_real_login()) {
// TRANS: Client error displayed when trying to log in while already logged in. common_redirect(common_local_url('index'));
$this->clientError(_('Already logged in.'));
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') { } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->checkLogin(); $this->checkLogin();
} else { } else {