From 3a6211c87562e73cbb1edac603bad87489abaff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Wed, 20 Apr 2016 19:22:57 +0200
Subject: [PATCH 1/2] FIX: fix escaped pagination in content overview

---
 resources/views/admin/content/overview.blade.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/resources/views/admin/content/overview.blade.php b/resources/views/admin/content/overview.blade.php
index 307c64a9..b72d23b0 100644
--- a/resources/views/admin/content/overview.blade.php
+++ b/resources/views/admin/content/overview.blade.php
@@ -31,11 +31,9 @@
         </div>
     @endif
 
-
-
     @include('admin.content.overviewTiles')
 
     <div class="row">
-        {{$pages->render()}}
+        {!! $pages->render() !!}
     </div>
 @stop
\ No newline at end of file

From 93bafee2e7917a9db33caf2647dc3792062bb1f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Wed, 20 Apr 2016 19:23:26 +0200
Subject: [PATCH 2/2] FIX: redirect to directory detail after file delete

---
 app/Http/Controllers/Admin/EditUploadedFile.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/EditUploadedFile.php b/app/Http/Controllers/Admin/EditUploadedFile.php
index cac6bf5c..dc923eba 100644
--- a/app/Http/Controllers/Admin/EditUploadedFile.php
+++ b/app/Http/Controllers/Admin/EditUploadedFile.php
@@ -82,10 +82,11 @@ class EditUploadedFile extends Controller
             return $this->fileNotFound();
         }
 
+        $directoryId = $file->directory_id;
         $file->delete();
 
         return redirect()
-            ->route('upload.overview')
+            ->route('upload.overview', ['id' => $directoryId])
             ->with('success', trans('admin/fileManager.fileDeleted'));
     }