lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

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

Browse source 
Removed escaping on notes for file uploads
This commit is contained in:
snipe 2024-04-22 14:59:55 +01:00 • committed by GitHub
commit cfe39afc11
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/AssetModelsFilesController.php
View file

@ -38,7 +38,7 @@ class AssetModelsFilesController extends Controller
$file_name = $request->handleFile('private_uploads/assetmodels/','model-'.$model->id,$file); $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')); return redirect()->back()->with('success', trans('general.file_upload_success'));

2
app/Http/Controllers/Assets/AssetFilesController.php
View file

@ -38,7 +38,7 @@ class AssetFilesController extends Controller
foreach ($request->file('file') as $file) { foreach ($request->file('file') as $file) {
$file_name = $request->handleFile('private_uploads/assets/','hardware-'.$asset->id, $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')); return redirect()->back()->with('success', trans('admin/hardware/message.upload.success'));