From a6b3aa5f0448fc250b88faa3a1da7b44c895d64d Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 22 Sep 2021 19:04:25 -0700 Subject: [PATCH] Don't try to delete the file if there is no log entry Signed-off-by: snipe --- app/Http/Controllers/Assets/AssetFilesController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Assets/AssetFilesController.php b/app/Http/Controllers/Assets/AssetFilesController.php index 7cdd075ab9..0a010a82d0 100644 --- a/app/Http/Controllers/Assets/AssetFilesController.php +++ b/app/Http/Controllers/Assets/AssetFilesController.php @@ -117,13 +117,13 @@ class AssetFilesController extends Controller $this->authorize('update', $asset); $log = Actionlog::find($fileId); if ($log) { - if (Storage::exists($rel_path.'/'.$log->filename)) { - Storage::delete($rel_path.'/'.$log->filename); + if (Storage::exists($rel_path.'/'.$log->filename)) { + Storage::delete($rel_path.'/'.$log->filename); } $log->delete(); return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success')); } - $log->delete(); + return redirect()->back() ->with('success', trans('admin/hardware/message.deletefile.success')); }