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

src build elFinder-2.1-9aaa0cf

Browse Source
This commit is contained in:
nao-pon
2020-01-10 23:16:08 +09:00
parent bfa0a6ad26
commit 228a511fce
12 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinder.class.php
+14 -3
View File
@@ -1280,6 +1280,8 @@ class elFinder
* @param string $netKey
* @param string $optionKey
* @param mixed $val
*
* @return bool
*/
public function updateNetVolumeOption($netKey, $optionKey, $val)
{
@@ -1287,7 +1289,9 @@ class elFinder
if (is_string($netKey) && isset($netVolumes[$netKey]) && is_string($optionKey)) {
$netVolumes[$netKey][$optionKey] = $val;
$this->saveNetVolumes($netVolumes);
return true;
}
return false;
}
/**
@@ -2246,9 +2250,16 @@ class elFinder
}
$rm['realpath'] = $volume->realpath($target);
return ($file = $volume->rename($target, $name)) == false
? array('error' => $this->error(self::ERROR_RENAME, $rm['name'], $volume->error()))
: array('added' => array($file), 'removed' => array($rm));
$file = $volume->rename($target, $name);
if ($file === false) {
return array('error' => $this->error(self::ERROR_RENAME, $rm['name'], $volume->error()));
} else {
if ($file['hash'] !== $rm['hash']) {
return array('added' => array($file), 'removed' => array($rm));
} else {
return array('changed' => array($file));
}
}
}
}