Merge commit '420ae249f9602535095457aae949e7e0093b9db7'

Author: maki10

src/Http/Controllers/PagesController.php

@@ -218,7 +218,7 @@ public function getEditElement($element_id)
         $keys = explode('.', $element->key);
         $key = $keys[1];
 
-        $mime = empty($element->content) || $element->page_element_type_id != 3 ? null : Storage::mimeType('public/'.$element->content);
+        $mime = Storage::exists('public/'.$element->content) ? Storage::mimeType('public/'.$element->content) : null;
 
         return view('admin::pages.edit-element', compact('element', 'mime', 'key'));
     }

src/resources/views/pages/edit-element.blade.php

@@ -54,15 +54,22 @@
 
 			@elseif ($element->page_element_type_id == 3 || old('page_element_type_id') == 3)
 
-				@if (strstr($mime, 'image') != false)
+				@if (strstr($mime, 'image') !== false)
 					<div class="cf" style="position: relative">
 						<img src="{{ asset('storage').'/'.$element->content }}" alt="" style="max-width: 200px; width: 100%; background-color: #ddd;" class="left">
 						<div class="cf">
 							<input type="hidden" name="content" value="{{ $element->content }}">
 							<a href="pages/delete-element-file/{{ $element->id }}" class="button remove-item file image left">Delete file</a>
 						</div>
 					</div>
-				@elseif ($mime != null)
+				@elseif ($mime === null)
+					<div class="cf" style="position: relative">
+						<div class="cf">
+							<input type="hidden" name="content" value="{{ $element->content }}">
+							<a href="pages/delete-element-file/{{ $element->id }}" class="button remove-item file left">Delete file</a>
+						</div>
+					</div>
+				@else
 					<div class="cf" style="position: relative">
 						<a href="{{ asset('storage').'/'.$element->content }}" download class="button item left">{{ $element->title }}</a>
 						<div class="cf">