aboutsummaryrefslogtreecommitdiffstats
path: root/mod/openid.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-08-30 11:00:23 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-08-30 11:00:23 +0200
commitd0926240a87327a7e38b822802ac192336f68791 (patch)
tree49c5d2eec9954efbe313e7130e1ce970a56c60e9 /mod/openid.php
parent97806544bcd7ee3831ffc515062afe0812828b76 (diff)
parent0f1bc6e9571e367b37246e43ce08921bf317fa7c (diff)
downloadvolse-hubzilla-d0926240a87327a7e38b822802ac192336f68791.tar.gz
volse-hubzilla-d0926240a87327a7e38b822802ac192336f68791.tar.bz2
volse-hubzilla-d0926240a87327a7e38b822802ac192336f68791.zip
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'mod/openid.php')
-rw-r--r--mod/openid.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/openid.php b/mod/openid.php
index 6fbd013b8..3c3293147 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -55,7 +55,8 @@ function openid_content(&$a) {
}
- $r = q("SELECT * FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
+ $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
+ FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
dbesc($_SESSION['openid'])
);
if(! count($r)) {