Merge branch 'dev' into 'dev'

Update OAuth2Storage.php - fix email retrieval in getUser

See merge request hubzilla/core!1436
This commit is contained in:
M. Dent 2018-12-15 22:33:03 +01:00
commit c854ec0686

View File

@ -64,7 +64,7 @@ class OAuth2Storage extends \OAuth2\Storage\Pdo {
return( [
'webfinger' => channel_reddress($x),
'portable_id' => $x['channel_hash'],
'email' => $a['account_email'],
'email' => $a[0]['account_email'],
'username' => $x['channel_address'],
'user_id' => $x['channel_id'],
'name' => $x['channel_name'],