Branch '2.3-stable' - pear/Kolab_Freebusy

[Christoph Wickert]

 pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p2.patch |   35 ++++++++++
 1 file changed, 35 insertions(+)

New commits:
commit 8f8cdff868ebc50da932e08c2be8f4d622635d39
Author: Gunnar Wrobel <p at rdus.de>
Date:   Wed May 18 13:18:09 2011 +0000

    kolab/issue4730 (generating free/busy cache broken in server 2.3.0)

diff --git a/pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p2.patch b/pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p2.patch
new file mode 100644
index 0000000..b3aa126
--- /dev/null
+++ b/pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p2.patch
@@ -0,0 +1,35 @@
+From: Gunnar Wrobel <wrobel at pardus.de>
+Subject: [PATCH] Kolab_FreeBusy_0.5.1_p2.patch
+
+kolab/issue4730 (generating free/busy cache broken in server 2.3.0)
+
+STATUS: MERGED
+
+Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>
+
+--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy.php	9 May 2011 08:35:48 -0000	1.10.2.6
++++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy.php	18 May 2011 13:13:18 -0000
+@@ -283,8 +283,8 @@
+                 $owner = $access->user;
+                 unset($req_folder[0]);
+             }
+-
+-            $trigger = $owner . ($domain ? '@' . $domain : '') . '/' . join('/', $req_folder);
++            $owner = $owner . ($domain ? '@' . $domain : '');
++            $trigger = $owner . '/' . join('/', $req_folder);
+             $trigger = String::convertCharset($trigger, 'UTF7-IMAP', 'UTF-8');
+
+             /* Validate folder access */
+@@ -320,9 +320,10 @@
+             }
+
+             /* Update the cache */
+-            $vCal = $this->_generate($this->_getResource($trigger, $owner));
+-            if (is_a($vCal, 'PEAR_Error')) {
+-                $reporter->failure($calendar->name, $vCal->getMessage());
++            try {
++                $vCal = $this->_generate($this->_getResource($trigger, $owner));
++            } catch (Horde_Kolab_FreeBusy_Exception $e) {
++                $reporter->failure($calendar->name, $e->getMessage());
+                 continue;
+             }