From 52a86d747774e8b90956bfad007d3922f62748fa Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Wed, 8 Dec 2010 14:04:39 +0000 Subject: [PATCH] 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 --- phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php index 096aaebbef..d077472fb5 100644 --- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php +++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php @@ -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"]);'));