From 6b1841dccb6f0327739098cfbc82e0eb558ab3c5 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 3 Oct 2008 08:30:40 +0000 Subject: [PATCH] "remove eACL on rmdir also for STORE2DB" --- phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php index 3c14d5784f..7c61359621 100644 --- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php +++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php @@ -677,10 +677,10 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper unset($stmt); // free statement object, on some installs a new prepare fails otherwise! $stmt = self::$pdo->prepare('DELETE FROM '.self::TABLE.' WHERE fs_id=?'); - if (($ret = $stmt->execute(array($stat['ino']))) && self::url2operation($url) == self::STORE2FS) + if (($ret = $stmt->execute(array($stat['ino'])))) { self::eacl($path,null,false,$stat['ino']); // remove all (=false) evtl. existing extended acl for that dir - rmdir(self::_fs_path($path)); + if (self::url2operation($url) == self::STORE2FS) rmdir(self::_fs_path($path)); } return $ret; }