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

Merge branch '2.x' into 2.1

Browse Source
This commit is contained in:
nao-pon
2014-12-21 15:21:56 +09:00
parent d8acd67fcb 3406718f3e
commit 836a7439e0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeLocalFileSystem.class.php
+2 -2
View File
@@ -85,8 +85,8 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
// check quarantine dir
$this->quarantine = '';
if (!empty($this->options['quarantine'])) {
if ($this->options['quarantine'] !== basename($this->options['quarantine'])) {
if (is_dir($this->options['quarantine']) && is_writable($this->options['quarantine'])) {
if (is_dir($this->options['quarantine'])) {
if (is_writable($this->options['quarantine'])) {
$this->quarantine = $this->options['quarantine'];
}
$this->options['quarantine'] = '';