diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-24 16:55:49 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-24 16:55:49 -0400 |
| commit | ff87732053bae38879988ba7d002a294998ccb4e (patch) | |
| tree | ccccfe7fc8976baf1f0cd4438a57bf817dc4052c /actions/confirmaddress.php | |
| parent | 27aeba01dd366f15f7847267b7518fb873987ddb (diff) | |
| parent | f3cdc7f272e409d391979d3e6c58dd63573530c0 (diff) | |
Merge branch '0.8.x' into testing
Conflicts:
actions/twitterauthorization.php
lib/oauthclient.php
lib/twitter.php
lib/twitterapi.php
lib/twitteroauthclient.php
scripts/twitterstatusfetcher.php
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'); |