From 5c8fbd410470bf13b30f8e0870812a682b325547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Sat, 10 Oct 2020 10:33:53 +0300
Subject: [PATCH] close #1633 Fixed: Broken images displayed in User List page

---
 app/Models/Auth/User.php                         | 2 +-
 resources/views/partials/admin/navbar.blade.php  | 6 ++++--
 resources/views/partials/portal/navbar.blade.php | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php
index f8c7e94e0..75b4b6881 100644
--- a/app/Models/Auth/User.php
+++ b/app/Models/Auth/User.php
@@ -115,7 +115,7 @@ class User extends Authenticatable
             }
         }
 
-        if (!empty($value) && !$this->hasMedia('picture')) {
+        if (!empty($value)) {
             return $value;
         } elseif (!$this->hasMedia('picture')) {
             return false;
diff --git a/resources/views/partials/admin/navbar.blade.php b/resources/views/partials/admin/navbar.blade.php
index 0fb445efe..238969f90 100644
--- a/resources/views/partials/admin/navbar.blade.php
+++ b/resources/views/partials/admin/navbar.blade.php
@@ -227,8 +227,10 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
                         <div class="media align-items-center">
-                            @if (is_object($user->picture))
-                                <img src="{{ Storage::url($user->picture->id) }}" class="rounded-circle image-style user-img" alt="{{ $user->name }}"/>
+                            @if (setting('default.use_gravatar', '0') == '1')
+                                <img src="{{ $user->picture }}" alt="{{ $user->name }}" class="rounded-circle image-style user-img" title="{{ $user->name }}">
+                            @elseif (is_object($user->picture))
+                                <img src="{{ Storage::url($user->picture->id) }}" class="rounded-circle image-style user-img" alt="{{ $user->name }}" title="{{ $user->name }}">
                             @else
                                 <img src="{{ asset('public/img/user.svg') }}" class="user-img" alt="{{ $user->name }}"/>
                             @endif
diff --git a/resources/views/partials/portal/navbar.blade.php b/resources/views/partials/portal/navbar.blade.php
index 01e834e6c..97a0f4b2a 100644
--- a/resources/views/partials/portal/navbar.blade.php
+++ b/resources/views/partials/portal/navbar.blade.php
@@ -91,8 +91,10 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <div class="media align-items-center">
-                            @if (is_object($user->picture))
-                                <img src="{{ Storage::url($user->picture->id) }}" class="rounded-circle image-style user-img" alt="{{ $user->name }}"/>
+                            @if (setting('default.use_gravatar', '0') == '1')
+                                <img src="{{ $user->picture }}" alt="{{ $user->name }}" class="rounded-circle image-style user-img" title="{{ $user->name }}">
+                            @elseif (is_object($user->picture))
+                                <img src="{{ Storage::url($user->picture->id) }}" class="rounded-circle image-style user-img" alt="{{ $user->name }}" title="{{ $user->name }}">
                             @else
                                 <img src="{{ asset('public/img/user.svg') }}" class="user-img" alt="{{ $user->name }}"/>
                             @endif