Merge branch 'develop' into rewrites/coding-convention-split2-1-2

[friendica.git] / mod / openid.php

diff --git a/mod/openid.php b/mod/openid.php
index ce707c4150b1195dd84572bf79cacc99cc7221de..b45cd97975e3f7b838b3eb2283cafcd74a4d9f3c 100644 (file)
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -4,7 +4,7 @@
 require_once('library/openid.php');
 
 
-function openid_content(App &$a) {
+function openid_content(App $a) {
 
        $noid = get_config('system','no_openid');
        if($noid)
@@ -30,7 +30,7 @@ function openid_content(App &$a) {
                        //       mod/settings.php in 8367cad so it might have left mixed
                        //       records in the user table
                        //
-                       $r = q("SELECT * FROM `user`
+                       $r = q("SELECT *, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` FROM `user`
                                WHERE ( `openid` = '%s' OR `openid` = '%s' )
                                AND `blocked` = 0 AND `account_expired` = 0
                                AND `account_removed` = 0 AND `verified` = 1
@@ -47,7 +47,7 @@ function openid_content(App &$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());