gunnar: server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0 t_framework_HK_UV_NoDuplicationOnUidChange.diff, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Sun Feb 28 10:24:24 CET 2010
Author: gunnar
Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0
In directory doto:/tmp/cvs-serv30487/Kolab_Storage/patches/Kolab_Storage-0.4.0
Modified Files:
t_framework_HK_UV_NoDuplicationOnUidChange.diff
Log Message:
Update patch for kolab/issue3238 as we had a newer version there.
Index: t_framework_HK_UV_NoDuplicationOnUidChange.diff
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0/t_framework_HK_UV_NoDuplicationOnUidChange.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_framework_HK_UV_NoDuplicationOnUidChange.diff 27 Feb 2010 22:59:54 -0000 1.1
+++ t_framework_HK_UV_NoDuplicationOnUidChange.diff 28 Feb 2010 09:24:22 -0000 1.2
@@ -1,22 +1,28 @@
-REF: https://issues.kolab.org/issue3238
+From: root <Gunnar Wrobel wrobel at pardus.de>
+Subject: [PATCH] t/SyncML/HK/GW/DoubleSyncFix
+
+When the uid validity of an IMAP folder changes this confuses the Kolab storage
+driver and leads to double entries. The attached patch has been proposed by
+Univention and should be applied after some cleanup.
+
+REF: https://issues.kolab.org/issue3238
+
+Signed-off-by: root <Gunnar Wrobel wrobel at pardus.de>
+
--- a/a/a/lib/Horde/Kolab/Storage/Data.php 2008-10-20 16:27:27.000000000 +0200
+++ a/a/a/lib/Horde/Kolab/Storage/Data.php 2008-10-20 16:38:34.000000000 +0200
-@@ -400,7 +400,17 @@
- $this->_updateHistory($object['uid'], $mod_ts, 'modify');
- $modified[] = $object['uid'];
- } else {
-- $this->_updateHistory($object['uid'], $mod_ts, 'add');
-+ // entries that should be added to the history MUST not
-+ // have an existing entry in the history!! otherwise
-+ // they are just marked as "modified"
-+ $history = &Horde_History::singleton();
-+ $history_id = $this->_app_consts['application'] . ':'
-+ . $this->_share_uid . ':' . $object_uid;
-+ if ($history->getActionTimestamp ($history_id, 'add') != 0) {
-+ $this->_updateHistory($object['uid'], $mod_ts, 'add');
-+ } else {
-+ $this->_updateHistory($object['uid'], $mod_ts, 'modify');
-+ }
- }
- } else {
- $this->_cache->ignore($id);
+@@ -457,6 +457,14 @@ class Kolab_Data {
+ $history = &Horde_History::singleton();
+
+ $history_id = $app . ':' . $this->_folder->getShareId() . ':' . $object_uid;
++
++ // entries that should be added to the history MUST not
++ // have an existing entry in the history!! otherwise
++ // they are just marked as "modified"
++ if ($action == 'add' && $history->getActionTimestamp($history_id, 'add') == 0) {
++ $action = 'modify';
++ }
++
+ $history->log($history_id, array('action' => $action, 'ts' => $mod_ts), true);
+ }
+
More information about the commits
mailing list