Revert "Prevent the folder cache from being overwritten."

This reverts commit e596382. Bug: 13273 This won't work as-is. It will prevent any folder changes from sticking. Correct fix shortly.
horde · Aug 19, 2014 · 5f3c55b · 5f3c55b
1 parent e596382
commit 5f3c55b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 19 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Collections.php b/framework/ActiveSync/lib/Horde/ActiveSync/Collections.php
@@ -905,13 +905,7 @@ public function updateCache()
      */
     public function 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();
-        }
+        $this->_cache->save();
     }
 
     /**

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php b/framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php
@@ -682,18 +682,6 @@ 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.
      *