From 4d6db5b334cdc997ba5adb903dcea4478ef05778 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Fri, 26 Apr 2019 13:11:28 -0600 Subject: [PATCH] Fix for `avatar_url` provided by 3rd party providers --- CHANGELOG.md | 1 + system/src/Grav/Common/User/Traits/UserTrait.php | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 287c860d6..ff319d0b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ 1. [](#bugfix) * Fixed `$grav['route']` from being modified when the route instance gets modified * Fixed Assets options array mixed with standalone priority [#2477](https://github.com/getgrav/grav/issues/2477) + * Fix for `avatar_url` provided by 3rd party providers # v1.6.8 ## 04/23/2019 diff --git a/system/src/Grav/Common/User/Traits/UserTrait.php b/system/src/Grav/Common/User/Traits/UserTrait.php index 2b6976880..f711cc92b 100644 --- a/system/src/Grav/Common/User/Traits/UserTrait.php +++ b/system/src/Grav/Common/User/Traits/UserTrait.php @@ -148,12 +148,13 @@ trait UserTrait // Try looking for provider. $provider = $this->get('provider'); - if (\is_array($provider)) { - if (isset($provider['avatar_url']) && \is_string($provider['avatar_url'])) { - return $provider['avatar_url']; + $provider_options = $this->get($provider); + if (\is_array($provider_options)) { + if (isset($provider_options['avatar_url']) && \is_string($provider_options['avatar_url'])) { + return $provider_options['avatar_url']; } - if (isset($provider['avatar']) && \is_string($provider['avatar'])) { - return $provider['avatar']; + if (isset($provider_options['avatar']) && \is_string($provider_options['avatar'])) { + return $provider_options['avatar']; } }