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.0' into 2.x

Browse Source 
Conflicts:
	php/elFinderVolumeLocalFileSystem.class.php
This commit is contained in:
nao-pon
2015-11-12 09:48:00 +09:00
parent 48d0f61ad2 65e193f8e5
commit 61dbd00b72
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeLocalFileSystem.class.php
+3 -2
View File
@@ -818,8 +818,9 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
foreach (scandir($path) as $name) {
if ($name != '.' && $name != '..') {
$p = $path.DIRECTORY_SEPARATOR.$name;
if (is_link($p) || !$this->nameAccepted($name)) {
$this->setError(elFinder::ERROR_SAVE, $name);
if (is_link($p) || !$this->nameAccepted($name)
||
(($mimeByName = elFinderVolumeDriver::mimetypeInternalDetect($name)) && $mimeByName !== 'unknown' && !$this->allowPutMime($mimeByName))) {
return true;
}
if (is_dir($p) && $this->_findSymlinks($p)) {