gunnar: server/pear/Horde_SyncML/patches/Horde_SyncML-0.7.0dev20091215 t_SyncML_HK_GW_CombinedFixes.diff, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/pear/Horde_SyncML/patches/Horde_SyncML-0.7.0dev20091215
In directory doto:/tmp/cvs-serv5997/pear/Horde_SyncML/patches/Horde_SyncML-0.7.0dev20091215

Modified Files:
	t_SyncML_HK_GW_CombinedFixes.diff 
Log Message:
MFB: kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch update needed)

Index: t_SyncML_HK_GW_CombinedFixes.diff
===================================================================
RCS file: /kolabrepository/server/pear/Horde_SyncML/patches/Horde_SyncML-0.7.0dev20091215/t_SyncML_HK_GW_CombinedFixes.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_SyncML_HK_GW_CombinedFixes.diff	22 Jan 2010 23:09:36 -0000	1.1
+++ t_SyncML_HK_GW_CombinedFixes.diff	27 Feb 2010 22:19:36 -0000	1.2
@@ -53,7 +53,7 @@
                                    __FILE__, __LINE__, PEAR_LOG_DEBUG);
                  continue;
              }
-+            if ($suid_ts > $to_ts) {
++            if ($add_ts[$suid] > $to_ts) {
 +                // Add delayed to the next sync operation
 +                $this->logMessage("Add ignored, lies in sync future: $suid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 +                continue;
@@ -65,7 +65,7 @@
                                        __FILE__, __LINE__, PEAR_LOG_DEBUG);
                      continue;
                  }
-+                if ($suid_ts > $to_ts) {
++                if ($mod_ts[$suid] > $to_ts) {
 +                    // Change delayed to the next sync operation
 +                    $this->logMessage("Change ignored, lies in sync future: $suid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 +                    continue;