diff options
| author | Craig Andrews <candrews@integralblue.com> | 2009-08-10 11:53:35 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2009-08-10 11:53:35 -0400 |
| commit | e9ed20a69d8f646bc85151c1e890f5828a966fcf (patch) | |
| tree | e72bdf25cc94c630c31863d2985b1f29b4b27414 /actions/confirmaddress.php | |
| parent | 17dcf1c3170bc905e3b0fdffc804d6f7229ac61b (diff) | |
| parent | 14b46e2183f10359cc53d597913a878f53e23719 (diff) | |
Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x
Diffstat (limited to 'actions/confirmaddress.php')
| -rw-r--r-- | actions/confirmaddress.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php index 725c1f1e3..3c41a5c70 100644 --- a/actions/confirmaddress.php +++ b/actions/confirmaddress.php @@ -67,7 +67,11 @@ class ConfirmaddressAction extends Action parent::handle($args); if (!common_logged_in()) { common_set_returnto($this->selfUrl()); - common_redirect(common_local_url('login')); + if (!common_config('site', 'openidonly')) { + common_redirect(common_local_url('login')); + } else { + common_redirect(common_local_url('openidlogin')); + } return; } $code = $this->trimmed('code'); |