From: TBK <redacted>
Date: Tue, 3 Mar 2020 23:08:01 +0000 (+0100)
Subject: Change check to verify that request is present and contains a file
X-Git-Tag: v0.28.3~1^2~10^2^2~2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/5cd56f63ff7b31abe0901ebea8931a70a5e4994c

Change check to verify that request is present and contains a file
---

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index 00dd60ac7..9c51ef4af 100644
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -57,7 +57,7 @@ class SettingController extends Controller
         }
 
         // Update logo image if set
-        if ($request->has('app_logo')) {
+        if ($request->hasFile('app_logo')) {
             $logoFile = $request->file('app_logo');
             $this->imageRepo->destroyByType('system');
             $image = $this->imageRepo->saveNew($logoFile, 'system', 0, null, 86);
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 207466f38..c91b7678c 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -191,7 +191,7 @@ class UserController extends Controller
         }
 
         // Save profile image if in request
-        if ($request->has('profile_image')) {
+        if ($request->hasFile('profile_image')) {
             $imageUpload = $request->file('profile_image');
             $this->imageRepo->destroyImage($user->avatar);
             $image = $this->imageRepo->saveNew($imageUpload, 'user', $user->id);