gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.9, 1.32.2.10

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv1536/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Add missing hotfix for kolab/issue3555 (unable to save filter settings more than once)

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.9
retrieving revision 1.32.2.10
diff -u -d -r1.32.2.9 -r1.32.2.10
--- horde-webmail-1.2.0_kolab_openpkg.patch	10 Sep 2009 09:32:26 -0000	1.32.2.9
+++ horde-webmail-1.2.0_kolab_openpkg.patch	23 Sep 2009 08:59:42 -0000	1.32.2.10
@@ -20001,24 +20001,26 @@
     LINK: https://www.intevation.de/roundup/kolab/issue3525
     LINK: https://www.intevation.de/roundup/kolab/issue3528
 From: Gunnar Wrobel <p at rdus.de>
-Subject: [PATCH] t/framework/HK/GW/Prefs_FileDriverHotfix
+Subject: [PATCH] t/framework/HK/GW/Prefs/FileDriverHotfix.diff
 
-Hotfixes kolab/issue3555 (unable to save filter settings more than once)
+A hotfix for https://issues.kolab.org/issue3555
+
+STATUS: Will not be merged upstream and is only a hotfix for Kolab Server 2.2.3
 
 Signed-off-by: Gunnar Wrobel <p at rdus.de>
 
 ---
-diff --git a/horde-webmail/lib/Horde/Kolab/Format/XML/hprefs.php b/horde-webmail/lib/Horde/Kolab/Format/XML/hprefs.php
-index e646ad6..22a94bc 100644
+diff a/horde-webmail/lib/Horde/Prefs/file.php b/horde-webmail/lib/Horde/Prefs/file.php
 --- a/horde-webmail/lib/Horde/Prefs/file.php
-+++ b/horde-webmail/lib/Horde/Prefs/file.php
-@@ -209,5 +209,6 @@
++++ a/horde-webmail/lib/Horde/Prefs/file.php
+@@ -209,6 +209,7 @@
                  }
  
                  $this->_file_cache[$scope][$name] = $pref;
 +                $this->_file_cache[$scope][$name]['m'] &= ~_PREF_DIRTY;
              }
          }
+ 
 diff -c a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 --- a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 +++ b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php