admin/Studio-42-elFinder
1
0
Fork 0
mirror of https://github.com/Studio-42/elFinder synced 2026-06-08 12:37:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[VD:LocalFileSystem] fix #1882 option copyJoin does not work on extract

Browse Source
This commit is contained in:
nao-pon
2017-02-15 16:41:27 +09:00
parent 1036ec6201
commit c9788461f3
2 changed files with 70 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeLocalFileSystem.class.php
+1 -5
View File
@@ -1102,14 +1102,10 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
}
} else {
$dstDir = dirname($path);
$res = false;
$result = array();
foreach($ls as $name) {
$target = $dstDir.DIRECTORY_SEPARATOR.$name;
if (is_dir($target)) {
$this->delTree($target);
}
if (rename($dir.DIRECTORY_SEPARATOR.$name, $target)) {
if (self::localMoveRecursive($dir.DIRECTORY_SEPARATOR.$name, $target, true, $this->options['copyJoin'])) {
$result[] = $target;
}
}