nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 16:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/version-1.8.3' into v2

Browse Source 
# Conflicts:
#	app/Http/Controllers/FileFunctions/EditItemsController.php
#	config/vuefilemanager.php
#	public/mix-manifest.json
This commit is contained in:
Peter Papp
2021-02-27 09:25:00 +01:00
parent 6736afaefb 7dd4e65d77
commit f38b265ba7
35 changed files with 1224 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/FileFunctions/EditItemsController.php
View File

@@ -116,7 +116,7 @@ class EditItemsController extends Controller
}
// If request have a change folder icon values set the folder icon
if ($request->type === 'folder' && $request->filled('folder_icon')) {
if ($request->type === 'folder' && $request->filled('icon')) {
Editor::set_folder_icon($request->folder_icon, $id);
}
@@ -158,9 +158,9 @@ class EditItemsController extends Controller
}
// If request have a change folder icon values set the folder icon
if ($request->type === 'folder' && $request->filled('folder_icon')) {
if ($request->type === 'folder' && $request->filled('icon')) {
Editor::set_folder_icon($request->folder_icon, $unique_id, $shared);
Editor::set_folder_icon($request->icon, $unique_id, $shared);
}
// Rename item