From 7f8c6fe282a15439ce173fb9028b27ac4a5c70ff Mon Sep 17 00:00:00 2001
From: Charlotte Dunois <github@charuru.moe>
Date: Wed, 13 May 2020 20:30:47 +0200
Subject: [PATCH] Take gravatar email into account in presenter

---
 app/Presenters/UserPresenter.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index da13c839c58d..c2d0253fa5bd 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -324,9 +324,14 @@ public function gravatar()
             return config('app.url').'/uploads/avatars/'.$this->avatar;
         }
 
-        if ((Setting::getSettings()->load_remote=='1') && ($this->email!='')) {
-            $gravatar = md5(strtolower(trim($this->email)));
-            return "//gravatar.com/avatar/".$gravatar;
+        if (Setting::getSettings()->load_remote=='1') {
+            if ($this->model->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
@@ -356,4 +361,4 @@ public function glyph()
     {
         return '<i class="fa fa-user" aria-hidden="true"></i>';
     }
-}
\ No newline at end of file
+}