diff options
author | Evan Prodromou <evan@status.net> | 2009-12-11 09:55:47 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-12-11 09:55:47 -0500 |
commit | e9b733e7f036bc03353ae6dd7b096ea179698a4d (patch) | |
tree | 1f93b0344e3d5b7c1e50f9ee272c8dc8d8ecf8c6 /actions/login.php | |
parent | 78fc9483d4d1fde4561905edf6594b86c4dc374e (diff) | |
parent | 85473ecf94e92cd0e6503e4d27ea26452076aafd (diff) |
Merge branch '0.9.x' into testing
Diffstat (limited to 'actions/login.php')
-rw-r--r-- | actions/login.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actions/login.php b/actions/login.php index a6f86c0ca..c775fa692 100644 --- a/actions/login.php +++ b/actions/login.php @@ -77,12 +77,13 @@ class LoginAction extends Action parent::handle($args); $disabled = common_config('logincommand','disabled'); + $disabled = isset($disabled) && $disabled; if (common_is_real_login()) { $this->clientError(_('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->checkLogin(); - } else if (!isset($disabled) && isset($args['user_id']) && isset($args['token'])){ + } else if (!$disabled && isset($args['user_id']) && isset($args['token'])){ $this->checkLogin($args['user_id'],$args['token']); } else { common_ensure_session(); |