[Phpgroupware-cvs] sync/inc/class.ipc_sync.inc.php, 1.33

[nomail]

Update of /sync/inc
Modified Files:
        Branch: 
          class.ipc_sync.inc.php

date: 2004/06/30 09:41:07;  author: mkaemmerer;  state: Exp;  lines: +2 -2

Log Message:
- added conversion to internal format in case of a conflict
=====================================================================
Index: sync/inc/class.ipc_sync.inc.php
diff -u sync/inc/class.ipc_sync.inc.php:1.32 
sync/inc/class.ipc_sync.inc.php:1.33
--- sync/inc/class.ipc_sync.inc.php:1.32        Tue Jun 22 14:50:20 2004
+++ sync/inc/class.ipc_sync.inc.php     Wed Jun 30 09:41:07 2004
@@ -514,7 +514,7 @@
       
     if ($id == 4) // == do nothing, resolve conflict later in phpGW
     {
-      $conflictid = $this->so->AddConfict($deviceid, $source, $LUID, $LData);
+      $conflictid = $this->bo->ConvertAndAddConfict($deviceid, $source, $LUID, 
$LData);
       error_log("handleConflict: saved conflict with conflictid: $conflictid 
for later resolveing");
     }