Fix detecting mirrored email changes.

horde · Nov 14, 2013 · 2f21dcc · 2f21dcc
1 parent 09867be
commit 2f21dcc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php
@@ -427,7 +427,7 @@ public function updateState(
                     'message_uid' => $change['id'],
                     'sync_key' => $syncKey,
                     'sync_devid' => $this->_deviceInfo->id,
-                    'sync_folderid' => $this->_collection['id'],
+                    'sync_folderid' => $change['serverid'],
                     'sync_user' => $user
                 );
                 if ($type == Horde_ActiveSync::CHANGE_TYPE_FLAGS) {
@@ -1328,7 +1328,7 @@ protected function _getMailMapChanges(array $changes)
             $ids[] = strval($change['id']);
         }
         $query = array(
-            'sync_folderid' => $this->_collection['id'],
+            'sync_folderid' => $this->_collection['serverid'],
             'sync_devid' => $this->_deviceInfo->id,
             'sync_user' => $this->_deviceInfo->user,
             'message_uid' => array('$in' => $ids)

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php
@@ -444,7 +444,7 @@ public function updateState(
                     $change['id'],
                     $syncKey,
                     $this->_deviceInfo->id,
-                    $this->_collection['id'],
+                    $change['serverid'],
                     $user,
                     ($type == Horde_ActiveSync::CHANGE_TYPE_FLAGS) ? $flag_value : true
                 );
@@ -1216,7 +1216,7 @@ protected function _getMailMapChanges(array $changes)
         }
 
         $values = array_merge(
-            array($this->_collection['id'],
+            array($this->_collection['serverid'],
                   $this->_deviceInfo->id,
                   $this->_deviceInfo->user),
             $ids);