Merge pull request #3221 from strk/remember-openid

Fix "remember me" cookie for OpenID logins
This commit is contained in:
Michael Vogel 2017-03-14 16:30:15 +01:00 committed by GitHub
commit a7e8e86800
3 changed files with 59 additions and 45 deletions

View file

@ -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