Fix merge/rebase.

horde · Jun 5, 2015 · c971fa5 · c971fa5
1 parent 278bb56
commit c971fa5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Cached.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Cached.php
@@ -252,7 +252,12 @@ public function synchronize($params = array())
         $previous = unserialize($this->_data_cache->getStamp());
 
         // check if UIDVALIDITY changed
-        if ($previous === false || $previous->isReset($current)) {
+        $is_reset = false;
+        if ($previous !== false) {
+            $is_reset = $previous->isReset($current);
+        }
+
+        if ($previous === false || $is_reset) {
             $this->_logger->debug(sprintf("Complete folder sync: user: %s, folder: %s, is_reset: %d", $user, $folder_path, $is_reset));
             $this->_completeSynchronization($current);
             return;