From: Dan Brown <redacted>
Date: Sun, 22 Jan 2017 12:19:50 +0000 (+0000)
Subject: Prevented a missing avatar from crashing the application
X-Git-Tag: v0.14.0~1^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/380f0f2042cc9efb824e19ce16912135a77d541f

Prevented a missing avatar from crashing the application
---

diff --git a/app/User.php b/app/User.php
index b5bb221e8..afcd9af70 100644
--- a/app/User.php
+++ b/app/User.php
@@ -160,8 +160,16 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function getAvatar($size = 50)
     {
-        if ($this->image_id === 0 || $this->image_id === '0' || $this->image_id === null) return baseUrl('/user_avatar.png');
-        return baseUrl($this->avatar->getThumb($size, $size, false));
+        $default = baseUrl('/user_avatar.png');
+        $imageId = $this->image_id;
+        if ($imageId === 0 || $imageId === '0' || $imageId === null) return $default;
+
+        try {
+            $avatar = baseUrl($this->avatar->getThumb($size, $size, false));
+        } catch (\Exception $err) {
+            $avatar = $default;
+        }
+        return $avatar;
     }
 
     /**