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 pull request #272 from nao-pon/fix_attr

Browse Source 
fix attr()
This commit is contained in:
Dmitry (dio) Levashov
2012-06-01 23:56:07 -07:00
parent 01ada53c7c 050f9769bc
commit e2f178075d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeDriver.class.php
+4 -4
View File
@@ -1963,7 +1963,7 @@ abstract class elFinderVolumeDriver {
* @return bool
* @author Dmitry (dio) Levashov
**/
protected function attr($path, $name, $val=false) {
protected function attr($path, $name, $val=null) {
if (!isset($this->defaults[$name])) {
return false;
}
@@ -1994,7 +1994,7 @@ abstract class elFinderVolumeDriver {
}
}
return $perm === null ? $this->defaults[$name] : !!$perm;
return $perm === null ? (is_null($val)? $this->defaults[$name] : $val) : !!$perm;
}
/**
@@ -2060,8 +2060,8 @@ abstract class elFinderVolumeDriver {
$stat['size'] = 'unknown';
}
$stat['read'] = intval($this->attr($path, 'read', isset($stat['read']) ? !!$stat['read'] : false));
$stat['write'] = intval($this->attr($path, 'write', isset($stat['write']) ? !!$stat['write'] : false));
$stat['read'] = intval($this->attr($path, 'read', isset($stat['read']) ? !!$stat['read'] : null));
$stat['write'] = intval($this->attr($path, 'write', isset($stat['write']) ? !!$stat['write'] : null));
if ($root) {
$stat['locked'] = 1;
} elseif ($this->attr($path, 'locked', !empty($stat['locked']))) {