Resolved conflicts

[bookstack] / resources / views / components / image-picker.blade.php

diff --git a/resources/views/components/image-picker.blade.php b/resources/views/components/image-picker.blade.php
index 228e8d230c6663009ed3431758d1007ab4a4ec38..2aa39d3d2639e18ed9150f5f811e12fbc235855c 100644 (file)
--- a/resources/views/components/image-picker.blade.php
+++ b/resources/views/components/image-picker.blade.php
@@ -13,7 +13,7 @@
         <button class="text-button neg" data-action="remove-image" type="button">{{ trans('common.remove') }}</button>
     @endif
 
-    <input type="hidden" name="{{$name}}" id="{{$name}}" value="{{ isset($currentId) && ($currentId !== '' && $currentId !== false) ? $currentId : $currentImage}}">
+    <input type="hidden" name="{{$name}}" id="{{$name}}" value="{{ isset($currentId) && ($currentId !== 0 && $currentId !== false) ? $currentId : $currentImage}}">
 </div>
 
 <script>