gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_framework_HK_GW_Kolab_XfbFixes.diff, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Sun Apr 26 11:24:23 CEST 2009
Author: gunnar
Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB
In directory doto:/tmp/cvs-serv29675/patches/1.2.0/KOLAB
Modified Files:
t_framework_HK_GW_Kolab_XfbFixes.diff
Log Message:
This came from the old mercurial patch queue but it seems to be incorrect as the fbrelevance is a simple integer and no array. It was also never commited upstream this way. So lets fix this and test it with the web client.
Index: t_framework_HK_GW_Kolab_XfbFixes.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB/t_framework_HK_GW_Kolab_XfbFixes.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_framework_HK_GW_Kolab_XfbFixes.diff 25 Apr 2009 21:04:19 -0000 1.1
+++ t_framework_HK_GW_Kolab_XfbFixes.diff 26 Apr 2009 09:24:21 -0000 1.2
@@ -11,7 +11,7 @@
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
-index 36844f9..1da391b 100644
+index 36844f9..29775cd 100644
--- a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
+++ b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
@@ -406,6 +406,22 @@ class Kolab_Folder {
@@ -27,7 +27,7 @@
+ }
+ }
+ if (isset($params['fbrelevance'])) {
-+ $result = $this->setFbrelevance(join(' ', $params['fbrelevance']));
++ $result = $this->setFbrelevance($params['fbrelevance']);
+ if (is_a($result, 'PEAR_Error')) {
+ return $result;
+ }
@@ -81,6 +81,12 @@
--
TOPGIT patch commit log
=======================
+
+commit c20af1d5f227a4444951676bdee250d88069d891
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Sun Apr 26 10:53:52 2009 +0200
+
+ This came from the old mercurial patch queue but it seems to be incorrect as the fbrelevance is a simple integer and no array. It was also never commited upstream this way. So lets fix this and test it with the web client.
commit 07447788c136353d40cc6c5b4d9f1d1f0d13ef76
Author: Gunnar Wrobel <p at rdus.de>
More information about the commits
mailing list