gunnar: server/php-kolab/Kolab_Freebusy/patches/Kolab_FreeBusy-0.1.7 Kolab_FreeBusy_0.1.7_p1.patch, NONE, 1.1

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/patches/Kolab_FreeBusy-0.1.7
In directory doto:/tmp/cvs-serv9913/patches/Kolab_FreeBusy-0.1.7

Added Files:
	Kolab_FreeBusy_0.1.7_p1.patch 
Log Message:
kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder)

--- NEW FILE: Kolab_FreeBusy_0.1.7_p1.patch ---
From: Gunnar Wrobel <wrobel at pardus.de>
Subject: [PATCH] Kolab_FreeBusy_0.1.7_p1.patch

Completes the fix for kolab/issue4395.

STATUS: MERGED

Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>

--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache/File/acl.php	15 Jun 2010 12:00:34 -0000	1.1.2.2
+++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache/File/acl.php	24 Jun 2010 17:22:11 -0000
@@ -103,7 +103,6 @@
             if (is_a($oldacl, 'PEAR_Error')) {
                 $oldacl = array();
             }
-            $acl = array_merge($oldacl, $acl);
         } else {
             $oldacl = array();
         }