extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for error during editing of extended ACL in filemanager; Report error if path to be checked does not exist; Make sure that array_merge uses a casted return of self::get_eacl in case the internal call will return false

Browse Source
This commit is contained in:
Klaus Leithoff 2010-12-08 14:04:39 +00:00
parent 7ffdb2f0f4
commit 52a86d7477
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
View File

@ -1385,6 +1385,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
{
if (!($stat = self::url_stat($path,STREAM_URL_STAT_QUIET)))
{
error_log(__METHOD__.__LINE__.' '.array2string($path).' not found!');
return false; // not found
}
$eacls = array();
@ -1399,7 +1400,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
}
if (($path = egw_vfs::dirname($path)))
{
return array_merge(self::get_eacl($path),$eacls);
return array_merge((array)self::get_eacl($path),$eacls);
}
// sort by length descending, to show precedence
usort($eacls,create_function('$a,$b','return strlen($b["path"])-strlen($a["path"]);'));