Merge branch 'develop' into api_ping

[friendica.git] / mod / openid.php

diff --git a/mod/openid.php b/mod/openid.php
index a92a124c0d06a8978dd72f5b9cbaede0cf43d20b..5d5539f00eb4e696429903179c1ae1b8022136d7 100644 (file)
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -1,8 +1,9 @@
 <?php
 
+
 require_once('library/openid.php');
 
-if(! function_exists('openid_content')) {
+
 function openid_content(&$a) {
 
        $noid = get_config('system','no_openid');
@@ -24,8 +25,8 @@ function openid_content(&$a) {
                                goaway(z_root());
                        }
 
-                       $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
-                               FROM `user` WHERE `openid` = '%s' AND `blocked` = 0
+                       $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` 
+                               FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 
                                AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
                                dbesc($authid)
                        );
@@ -39,7 +40,7 @@ function openid_content(&$a) {
                                require_once('include/security.php');
                                authenticate_success($r[0],true,true);
 
-                               // just in case there was no return url set
+                               // just in case there was no return url set 
                                // and we fell through
 
                                goaway(z_root());
@@ -93,4 +94,3 @@ function openid_content(&$a) {
        goaway(z_root());
        // NOTREACHED
 }
-}