Porting change from #8053 to master

Signed-off-by: snipe <snipe@snipe.net>
snipe · May 27, 2020 · d14ab7e · d14ab7e
1 parent 001e721
commit d14ab7e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git 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