diff options
| author | Craig Andrews <candrews@integralblue.com> | 2009-08-16 19:50:37 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2009-08-16 19:50:37 -0400 |
| commit | 136a69a387719d560f97b6f8ee73d1224b2bac8c (patch) | |
| tree | e9c0c02d89119a9d8c35b2d0c2485d8d888a65f4 /actions/openidlogin.php | |
| parent | 46c77b83b1b10663ac80f6e1df604d529bb31dd4 (diff) | |
| parent | 75a0a3e18b001454ab4844bc63d4052faf502138 (diff) | |
Merge commit 'jeff-themovie/0.8.x-openid-enabled' into 0.8.x
Diffstat (limited to 'actions/openidlogin.php')
| -rw-r--r-- | actions/openidlogin.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actions/openidlogin.php b/actions/openidlogin.php index a8d052096..744aae713 100644 --- a/actions/openidlogin.php +++ b/actions/openidlogin.php @@ -26,7 +26,9 @@ class OpenidloginAction extends Action function handle($args) { parent::handle($args); - if (common_is_real_login()) { + if (!common_config('openid', 'enabled')) { + common_redirect(common_local_url('login')); + } else if (common_is_real_login()) { $this->clientError(_('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $openid_url = $this->trimmed('openid_url'); |