gunnar: server/horde/horde-framework HK-GW-Kolab_issue_2144.patch, NONE, 1.1 ChangeLog, 1.6, 1.7 horde-framework-kolab.spec, 1.24, 1.25

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv29719/horde/horde-framework

Modified Files:
	ChangeLog horde-framework-kolab.spec 
Added Files:
	HK-GW-Kolab_issue_2144.patch 
Log Message:
kolab/issue2144 (Calendar items of shared calendar not appearing)

--- NEW FILE: HK-GW-Kolab_issue_2144.patch ---
kolab/issue2144 (Calendar items of shared calendar not appearing)

diff -r dd49e5f044aa framework/Share/Share/kolab.php
--- a/framework/Share/Share/kolab.php	Wed Oct 10 14:22:14 2007 +0200
+++ b/framework/Share/Share/kolab.php	Thu Nov 01 10:59:06 2007 +0100
@@ -343,7 +343,8 @@ class Horde_Share_Storage_kolab {
                 // name.
                 $type = explode('.', $annotation);
                 if ($type[0] == $app_consts['mime_type_suffix']) {
-                    if (isset($type[1]) && $type[1] == 'default') {
+                    if (isset($type[1]) && $type[1] == 'default' &&
+                        substr($folder, 0, 6) == 'INBOX/' && !$this->_default) {
                         $this->_default = $folder;
                         array_push($shares, $this->buildShareId(Auth::getAuth()));
                     } else {

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	13 Sep 2007 13:50:55 -0000	1.6
+++ ChangeLog	1 Nov 2007 10:54:52 -0000	1.7
@@ -1,3 +1,11 @@
+2007-11-01  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-framework-kolab.spec:
+
+	Added HK-GW-Kolab_issue_2144.patch
+	Fixes kolab/issue2144 (Calendar items of shared calendar not appearing)
+	https://www.intevation.de/roundup/kolab/issue2144
+
 2007-09-12  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-framework-kolab.spec (AutoReqProv):
@@ -20,7 +28,7 @@
 
 2007-05-30  Gunnar Wrobel  <p at rdus.de>
 
-	* horde-framework-kolab.spec: 
+	* horde-framework-kolab.spec:
 
 	Added Kolab-Kolab-IMAP-cclient.php.patch since Kolab-2.1
 	still has a segfaulting PHP. See

Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- horde-framework-kolab.spec	10 Oct 2007 09:46:37 -0000	1.24
+++ horde-framework-kolab.spec	1 Nov 2007 10:54:52 -0000	1.25
@@ -2,8 +2,8 @@
 %define         V_horde_name framework
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2007
-%define         V_month 10
-%define         V_day   04
+%define         V_month 11
+%define         V_day   01
 %define         V_version 3.2_ALPHA
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
@@ -30,6 +30,7 @@
 Patch1:         HK-GW-Fix_the_share_params.patch
 Patch2:         HK-GW-Fix_annotation_use.patch
 Patch3:         HK-GW-Share_caching.patch
+Patch4:         HK-GW-Kolab_issue_2144.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -54,6 +55,7 @@
 	%patch -p2 -P 1
 	%patch -p2 -P 2
 	%patch -p2 -P 3
+	%patch -p2 -P 4
 
 %build