Merge branch 'thomasjfox-kolab-storage-fix-token-sync'

horde · Sep 17, 2015 · a984bc8 · a984bc8
2 parents ffd0267 + 2eecfe0
commit a984bc8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php
@@ -426,7 +426,10 @@ public function sync($folder, $token, array $ids = array())
      */
     public function getStampFromToken($folder, $token, array $ids)
     {
+        // always get folder status first, then sync()
+        $status = $this->status($folder);
         $sync = $this->sync($folder, $token, $ids);
+
         $ids = array_diff(
             $ids,
             $sync[Horde_Kolab_Storage_Folder_Stamp_Uids::DELETED]
@@ -436,7 +439,7 @@ public function getStampFromToken($folder, $token, array $ids)
             $sync[Horde_Kolab_Storage_Folder_Stamp_Uids::ADDED]
         );
         return new Horde_Kolab_Storage_Folder_Stamp_Uids(
-            $this->status($folder),
+            $status,
             $ids
         );
     }