gunnar: server/horde/horde-framework HK-GW-Fix_the_share_params.patch, NONE, 1.1 horde-framework-kolab.spec, 1.21, 1.22
cvs at kolab.org
cvs at kolab.org
Tue Oct 2 16:21:36 CEST 2007
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv6110/horde/horde-framework
Modified Files:
horde-framework-kolab.spec
Added Files:
HK-GW-Fix_the_share_params.patch
Log Message:
Adding the necessary turba and mnemo fixes for the next beta release.
--- NEW FILE: HK-GW-Fix_the_share_params.patch ---
Fixes the params array now used in turba.
diff -r e60357d4352e framework/Share/Share/kolab.php
--- a/framework/Share/Share/kolab.php Tue Oct 02 10:28:53 2007 +0200
+++ b/framework/Share/Share/kolab.php Tue Oct 02 11:47:54 2007 +0200
@@ -1036,7 +1036,9 @@ class ImapObject_Share {
case 'params':
$params = $this->getAttribute('params');
if (is_a($params, 'PEAR_Error') || $params == '') {
- $params = serialize(array('source' => 'kolab'));
+ $params = serialize(array('source' => 'kolab',
+ 'default' => $this->get('default'),
+ 'name' => $this->get('name')));
}
$this->data['params'] = $params;
break;
@@ -1080,6 +1082,13 @@ class ImapObject_Share {
}
$this->data['folder'] = String::convertCharset($value, NLS::getCharset(), 'UTF7-IMAP');
$this->data['name'] = $this->getTitle($this->data['folder']);
+ break;
+
+ case 'params':
+ $value = unserialize($value);
+ if (isset($value['default'])) {
+ $this->data['default'] = $value['default'];
+ }
break;
default:
Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- horde-framework-kolab.spec 1 Oct 2007 15:47:19 -0000 1.21
+++ horde-framework-kolab.spec 2 Oct 2007 14:21:33 -0000 1.22
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 10
-%define V_day 01
+%define V_day 02
%define V_version 3.2_ALPHA
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
@@ -27,6 +27,7 @@
Source0: http://build.pardus.de/downloads/horde-%{V_horde_name}-%{V_version}.tar.bz2
Patch0: HK-GW-Fix_Prefs_for_Ingo.patch
+Patch1: HK-GW-Fix_the_share_params.patch
# Build Info
Prefix: %{l_prefix}
@@ -48,6 +49,7 @@
%prep
%setup -n framework
%patch -p2 -P 0
+ %patch -p2 -P 1
%build
More information about the commits
mailing list