Revert "Revert "Prevent the folder cache from being overwritten.""

This reverts commit 5f3c55b.
horde · Aug 19, 2014 · 5f7e450 · 5f7e450
1 parent 5f3c55b
commit 5f7e450
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Collections.php b/framework/ActiveSync/lib/Horde/ActiveSync/Collections.php
@@ -905,7 +905,13 @@ public function updateCache()
      */
     public function save()
     {
-        $this->_cache->save();
+        // HOTFIX. Need to check the timestamp to see if we should reload the
+        // folder cache before saving to ensure it isn't overwritten. See
+        // Bug: 13273
+        if (!$this->_cache->validateCache()) {
+            $this->_logger->info(sprintf('[%s] Updating the foldercache before saving.', $this->_procid));
+            $this->_cache->refreshFolderCache();
+        }
     }
 
     /**

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php b/framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php
@@ -682,6 +682,18 @@ public function clearFolders()
         $this->_dirty['folders'] = true;
     }
 
+    /**
+     * Refresh the folder cache from the backend.
+     *
+     * @since 2.18.0
+     */
+    public function refreshFolderCache()
+    {
+        $cache = $this->_state->getSyncCache($this->_devid, $this->_user);
+        $this->_data['folders'] = $cache['folders'];
+        $this->_dirty['folders'] = false;
+    }
+
     /**
      * Update a folder entry in the cache.
      *