Merge commit 'refs/merge-requests/159' of git://gitorious.org/statusnet/mainline into merge-requests/159
This commit is contained in:
commit
d594c83a5a
@ -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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user