From aa0ccf11fa35ccb295c04b8da79ff523db9c3841 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 7 Sep 2016 01:41:23 -0700
Subject: [PATCH] Only load the remote gravatar image if the server can talk to
 the outside world

---
 app/Models/User.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index 67a86782be..9a5180a698 100755
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -9,6 +9,7 @@ use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Watson\Validating\ValidatingTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use App\Http\Traits\UniqueUndeletedTrait;
+use App\Models\Setting;
 
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract
 {
@@ -146,10 +147,8 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
             return config('app.url').'/uploads/avatars/'.$this->avatar;
         }
 
-        if ($this->email) {
-            // Generate the Gravatar hash
+        if ((Setting::getSettings()->load_remote=='1') && ($this->email!='')) {
             $gravatar = md5(strtolower(trim($this->email)));
-            // Return the Gravatar url
             return "//gravatar.com/avatar/".$gravatar;
         }