Branch '2.3-stable' - pear/Kolab_Storage release-notes.txt

[Gunnar Wrobel]

 pear/Kolab_Storage/ChangeLog                                                |    9 +
 pear/Kolab_Storage/package.info                                             |    2 
 pear/Kolab_Storage/patches/Kolab_Storage-0.5.2/Kolab_Storage_0.5.2_p1.patch |   53 ++++++++++
 release-notes.txt                                                           |    8 +
 4 files changed, 69 insertions(+), 3 deletions(-)

New commits:
commit 0a35fc659272dfbc7d1cc396e292404fba46e2f6
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Aug 26 06:14:09 2011 +0000

    Fix folder name confusion.
    
            kolab/issue4753 (Cannot destinguish two address book with the same
                             name in the webclient)
            kolab/issue4762 (Duplicate calendar names in horde if user has
                             access to other users calendar)

diff --git a/pear/Kolab_Storage/ChangeLog b/pear/Kolab_Storage/ChangeLog
index 97bebb0..14e03d3 100644
--- a/pear/Kolab_Storage/ChangeLog
+++ b/pear/Kolab_Storage/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-26  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_Storage-0.5.2/Kolab_Storage_0.5.2_p1.patch:
+
+	kolab/issue4753 (Cannot destinguish two address book with the same
+	                 name in the webclient)
+	kolab/issue4762 (Duplicate calendar names in horde if user has
+	                 access to other users calendar)
+
 2011-07-29  Gunnar Wrobel  <p at rdus.de>
 
 	* package.info: Update to 0.5.2.
diff --git a/pear/Kolab_Storage/package.info b/pear/Kolab_Storage/package.info
index e66f281..ed2846c 100644
--- a/pear/Kolab_Storage/package.info
+++ b/pear/Kolab_Storage/package.info
@@ -16,7 +16,7 @@ package_origin='WGET'
 version='0.5.2'
 
 # Package release number
-release='20110729'
+release='20110826'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel'
diff --git a/pear/Kolab_Storage/patches/Kolab_Storage-0.5.2/Kolab_Storage_0.5.2_p1.patch b/pear/Kolab_Storage/patches/Kolab_Storage-0.5.2/Kolab_Storage_0.5.2_p1.patch
new file mode 100644
index 0000000..f1c94a0
--- /dev/null
+++ b/pear/Kolab_Storage/patches/Kolab_Storage-0.5.2/Kolab_Storage_0.5.2_p1.patch
@@ -0,0 +1,53 @@
+Index: lib/Horde/Kolab/Storage/Namespace/Element/Other.php
+===================================================================
+RCS file: /repository/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Attic/Other.php,v
+retrieving revision 1.1.2.1
+diff -u -B -r1.1.2.1 Other.php
+--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Other.php	22 Jun 2010 09:31:40 -0000	1.1.2.1
++++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Other.php	26 Aug 2011 05:45:23 -0000
+@@ -34,6 +34,19 @@
+     }
+ 
+     /**
++     * Return the title of a folder.
++     *
++     * @param string $name The name of the folder.
++     *
++     * @return string The title of the folder.
++     */
++    public function getTitle($name)
++    {
++        $path = explode($this->_delimiter, $name);
++        return '(' . $path[1] . ') ' . parent::getTitle($name);
++    }
++
++    /**
+      * Return an array describing the path elements of the folder.
+      *
+      * @param string $name The name of the folder.
+Index: lib/Horde/Kolab/Storage/Namespace/Element/Shared.php
+===================================================================
+RCS file: /repository/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Attic/Shared.php,v
+retrieving revision 1.1.2.1
+diff -u -B -r1.1.2.1 Shared.php
+--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Shared.php	22 Jun 2010 09:31:40 -0000	1.1.2.1
++++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Shared.php	26 Aug 2011 05:45:23 -0000
+@@ -14,6 +14,18 @@
+     }
+ 
+     /**
++     * Return the title of a folder.
++     *
++     * @param string $name The name of the folder.
++     *
++     * @return string The title of the folder.
++     */
++    public function getTitle($name)
++    {
++        return '> ' . parent::getTitle($name);
++    }
++
++    /**
+      * Return the owner of a folder.
+      *
+      * @param string $name The name of the folder.
diff --git a/release-notes.txt b/release-notes.txt
index 0377379..e308b9c 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -18,12 +18,16 @@ the 1st.README file in the package directory.
 
     - Kolab_Storage-0.5.2-20110729
 
+	kolab/issue4466 (Horde warning "Invalid shutdown callback" in
+	                 Kolab/Storage/List.php) 
+	kolab/issue4753 (Cannot destinguish two address book with the same name
+	                 in the webclient)
+	kolab/issue4762 (Duplicate calendar names in horde if user has access to
+	                 other users calendar)
 	bugzilla.kolabsys.com #117 (Groups appear as entries in contact folders)
 	bugzilla.kolabsys.com #135 (Add option to skip EXPUNGE command on object
 	delete)
 	bugzilla.kolabsys.com #137 (Folders caching issue (shutdown function))
-	kolab/issue4466 (Horde warning "Invalid shutdown callback" in
-	                 Kolab/Storage/List.php) 
 	bugzilla.kolabsys.com #206 (Folder rename and caching issue)
 	bugzilla.kolabsys.com #138 (ACL/MYRIGHTS result is not cached)
 	bugzilla.kolabsys.com #205 (Horde_Kolab_Storage must use MYRIGHTS, not