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 
Conflicts:
	php/elFinderVolumeDriver.class.php
This commit is contained in:
nao-pon
2015-01-27 18:00:06 +09:00
parent f4a6623ae9 9ccb359975
commit f69759bd6e
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeLocalFileSystem.class.php
+5 -3
View File
@@ -315,9 +315,11 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
$stat['mime'] = $dir ? 'directory' : $this->mimetype($path);
$stat['ts'] = filemtime($path);
$stat['read'] = is_readable($path);
$stat['write'] = is_writable($path);
if ($stat['read']) {
//logical rights first
$stat['read'] = is_readable($path)? null : false;
$stat['write'] = is_writable($path)? null : false;
if (is_null($stat['read'])) {
$stat['size'] = $dir ? 0 : $size;
}