Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

[quix0rs-gnu-social.git] / actions / confirmaddress.php

diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 2b7b949a48c8a42c3a5987d3fafd5bc6459dc89b..6fd74f3ff7889bf40e55d9df9343edecb0d10e6c 100644 (file)
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -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');