Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-06 12:31:53 +01:00
Code Issues Packages Projects Releases Activity

Merge branch '1.6' of https://github.com/getgrav/grav into feature/1.6-controller

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Matias Griese
2018-10-22 10:47:59 +03:00
parent fc0dfbe8b4 8590f4fbf5
commit bdc3f41ac2
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -7,6 +7,8 @@
* Added `Page::httpResponseCode()` and `Page::httpHeaders()` methods
1. [](#improved)
* Added apcu autoloader optimization
1. [](#bugfix)
* Use login provider User avatar if set
* Updated Grav `Processor` classes to implement PSR-15 `MiddlewareInterface`
# v1.6.0-beta.3

7
system/src/Grav/Common/User/User.php
View File

@@ -282,6 +282,13 @@ class User extends Data
$avatar = $this->avatar;
$avatar = array_shift($avatar);
return Grav::instance()['base_url'] . '/' . $avatar['path'];
} elseif ($this->provider) {
$provider = $this->provider;
if (isset($this->$provider['avatar_url'])) {
return $this->$provider['avatar_url'];
} elseif (isset($this->$provider['avatar'])) {
return $this->$provider['avatar'];
}
}
return 'https://www.gravatar.com/avatar/' . md5($this->email);