Merge pull request #14630 from snipe/bug/sc-25377/double_encoding_ass…

…ets_and_model_notes_on_upload Removed escaping on notes for file uploads
snipe · Apr 22, 2024 · cfe39af · cfe39af
2 parents c9873da + 2aa3ce1
commit cfe39af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/Http/Controllers/AssetModelsFilesController.php b/app/Http/Controllers/AssetModelsFilesController.php
@@ -38,7 +38,7 @@ public function store(UploadFileRequest $request, $modelId = null)
 
                 $file_name = $request->handleFile('private_uploads/assetmodels/','model-'.$model->id,$file);
 
-                $model->logUpload($file_name, e($request->get('notes')));
+                $model->logUpload($file_name, $request->get('notes'));
             }
 
             return redirect()->back()->with('success', trans('general.file_upload_success'));

diff --git a/app/Http/Controllers/Assets/AssetFilesController.php b/app/Http/Controllers/Assets/AssetFilesController.php
@@ -38,7 +38,7 @@ public function store(UploadFileRequest $request, $assetId = null)
             foreach ($request->file('file') as $file) {
                 $file_name = $request->handleFile('private_uploads/assets/','hardware-'.$asset->id, $file);
 
-                $asset->logUpload($file_name, e($request->get('notes')));
+                $asset->logUpload($file_name, $request->get('notes'));
             }
 
             return redirect()->back()->with('success', trans('admin/hardware/message.upload.success'));