summaryrefslogtreecommitdiff
path: root/actions/confirmaddress.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-21 16:45:42 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-21 16:45:42 -0400
commit59beff6b46fb7693812558eaf728ca3709e4b066 (patch)
tree3a178e7e1a68ce1390d4e6178000f744b38e68b6 /actions/confirmaddress.php
parentbacef32aaca791ec5e25bd951094baec0b41df28 (diff)
Revert "Added configuration option to only allow OpenID logins."
This reverts commit 14b46e2183f10359cc53d597913a878f53e23719. This functionality will need to be rewritten to work with the new OpenIDPlugin. Conflicts: index.php lib/logingroupnav.php
Diffstat (limited to 'actions/confirmaddress.php')
-rw-r--r--actions/confirmaddress.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 3c41a5c70..725c1f1e3 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -67,11 +67,7 @@ class ConfirmaddressAction extends Action
parent::handle($args);
if (!common_logged_in()) {
common_set_returnto($this->selfUrl());
- if (!common_config('site', 'openidonly')) {
- common_redirect(common_local_url('login'));
- } else {
- common_redirect(common_local_url('openidlogin'));
- }
+ common_redirect(common_local_url('login'));
return;
}
$code = $this->trimmed('code');