lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Take gravatar email into account in presenter

Browse source
This commit is contained in:
Charlotte Dunois 2020-05-13 20:30:47 +02:00 • committed by GitHub
parent 8cc9e61983
commit 7f8c6fe282
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Presenters/UserPresenter.php
View file

@ -324,9 +324,14 @@ class UserPresenter extends Presenter
return config('app.url').'/uploads/avatars/'.$this->avatar; return config('app.url').'/uploads/avatars/'.$this->avatar;
} }
if ((Setting::getSettings()->load_remote=='1') && ($this->email!='')) { if (Setting::getSettings()->load_remote=='1') {
$gravatar = md5(strtolower(trim($this->email))); if ($this->model->gravatar!='') {
return "//gravatar.com/avatar/".$gravatar; $gravatar = md5(strtolower(trim($this->model->gravatar)));
return "//gravatar.com/avatar/".$gravatar;
} elseif ($this->email!='') {
$gravatar = md5(strtolower(trim($this->email)));
return "//gravatar.com/avatar/".$gravatar;
}
} }
// Set a fun, gender-neutral default icon // Set a fun, gender-neutral default icon
@ -356,4 +361,4 @@ class UserPresenter extends Presenter
{ {
return '<i class="fa fa-user" aria-hidden="true"></i>'; return '<i class="fa fa-user" aria-hidden="true"></i>';
} }
} }