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] fix #2120 item copy between volumes is incomplete

Browse Source
This commit is contained in:
nao-pon
2017-08-03 09:46:06 +09:00
parent 68b43d7f69
commit 1cd6cf745e
4 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeLocalFileSystem.class.php
+2 -9
View File
@@ -866,7 +866,7 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
* @author Dmitry (dio) Levashov
**/
protected function _unlink($path) {
$ret = unlink($path);
$ret = is_file($path) && unlink($path);
$ret && clearstatcache();
return $ret;
}
@@ -900,7 +900,7 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
$meta = stream_get_meta_data($fp);
$uri = isset($meta['uri'])? $meta['uri'] : '';
if ($uri && ! preg_match('#^[a-zA-Z0-9]+://#', $uri)) {
if ($uri && ! preg_match('#^[a-zA-Z0-9]+://#', $uri) && !is_link($uri)) {
fclose($fp);
$mtime = filemtime($uri);
$isCmdPaste = ($this->ARGS['cmd'] === 'paste');
@@ -912,19 +912,12 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
if ($mtime && $this->ARGS['cmd'] === 'upload') {
touch($path, isset($this->options['keepTimestamp']['upload'])? $mtime : time());
}
// re-create the source file for remove processing of paste command
$isCmdPaste && !$isCmdCopy && touch($uri);
} else {
if (file_put_contents($path, $fp, LOCK_EX) === false) {
return false;
}
}
if (is_link($path)) {
unlink($path);
return $this->setError(elFinder::ERROR_SAVE, $name);
}
chmod($path, $this->options['fileMode']);
clearstatcache();
return $path;