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-a365810

Browse Source
This commit is contained in:
nao-pon
2016-03-25 00:01:49 +09:00
parent 9f8ecb1b26
commit da8b260b9c
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeDriver.class.php
+2 -2
View File
@@ -1884,7 +1884,7 @@ abstract class elFinderVolumeDriver {
return $this->setError(elFinder::ERROR_LOCKED, $this->path($stat['hash']));
}
// target is entity file of alias
if ($volume == $this && ($test == @$file['target'] || $test == $this->decode($src))) {
if ($volume === $this && ((isset($file['target']) && $test == $file['target']) || $test == $this->decode($src))) {
return $this->setError(elFinder::ERROR_REPLACE, $errpath);
}
// remove existed file
@@ -1897,7 +1897,7 @@ abstract class elFinderVolumeDriver {
}
// copy/move inside current volume
if ($volume == $this) {
if ($volume === $this) { // changing == operand to === fixes issue #1285 - Paul Canning 24/03/2016
$source = $this->decode($src);
// do not copy into itself
if ($this->inpathCE($destination, $source)) {