Branch '2.3-stable' - pear/Kolab_Freebusy

Christoph Wickert wickert at kolabsys.com
Wed May 18 09:52:54 CEST 2011


 pear/Kolab_Freebusy/ChangeLog                                                  |    6 +
 pear/Kolab_Freebusy/Kolab_FreeBusy.spec                                        |    2 
 pear/Kolab_Freebusy/package.info                                               |    2 
 pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p1.patch |   32 ++++++++++
 4 files changed, 40 insertions(+), 2 deletions(-)

New commits:
commit eea6bdd12c64ba5bafb1c8482da3daa39f54817c
Author: Gunnar Wrobel <p at rdus.de>
Date:   Wed May 18 06:22:06 2011 +0000

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

diff --git a/pear/Kolab_Freebusy/ChangeLog b/pear/Kolab_Freebusy/ChangeLog
index 3d085e0..0352e0b 100644
--- a/pear/Kolab_Freebusy/ChangeLog
+++ b/pear/Kolab_Freebusy/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-18  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p1.patch:
+
+	kolab/issue4730 (generating free/busy cache broken in server 2.3.0)
+
 2011-05-09  Gunnar Wrobel  <p at rdus.de>
 
 	* package.info:
diff --git a/pear/Kolab_Freebusy/Kolab_FreeBusy.spec b/pear/Kolab_Freebusy/Kolab_FreeBusy.spec
index ecdc251..7f1d1d4 100644
--- a/pear/Kolab_Freebusy/Kolab_FreeBusy.spec
+++ b/pear/Kolab_Freebusy/Kolab_FreeBusy.spec
@@ -7,7 +7,7 @@
 %define         V_repo_commit 
 %define         V_repo_release 
 %define         V_version 0.5.1
-%define         V_release 20110509
+%define         V_release 20110518
 %define         V_sourceurl http://pear.horde.org/get
 %define         V_php_lib_loc php
 %define         V_www_loc freebusy
diff --git a/pear/Kolab_Freebusy/package.info b/pear/Kolab_Freebusy/package.info
index b2480f0..8957ec9 100644
--- a/pear/Kolab_Freebusy/package.info
+++ b/pear/Kolab_Freebusy/package.info
@@ -16,7 +16,7 @@ package_origin='WGET'
 version='0.5.1'
 
 # Package release number
-release='20110509'
+release='20110518'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/server/development-2.3/externals'
diff --git a/pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p1.patch b/pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p1.patch
new file mode 100644
index 0000000..6e48182
--- /dev/null
+++ b/pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p1.patch
@@ -0,0 +1,32 @@
+From: Gunnar Wrobel <wrobel at pardus.de>
+Subject: [PATCH] Kolab_FreeBusy_0.5.1_p1.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/User/Kolab.php	10 Oct 2010 16:26:50 -0000	1.1.2.1
++++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/User/Kolab.php	18 May 2011 06:04:50 -0000
+@@ -67,6 +67,20 @@
+     }
+
+     /**
++     * Return the primary id of the user accessing the system.
++     *
++     * @return string The primary id.
++     */
++    public function getPrimaryId()
++    {
++        $id = parent::getPrimaryId();
++        if (empty($id)) {
++            return $this->_user->getId();
++        }
++        return $id;
++    }
++
++    /**
+      * Fetch the user data from the user db.
+      *
+      * @return NULL





More information about the commits mailing list