Ensure the new filtertype is persisted, even if there were no other c…

…hanges.
horde · Feb 19, 2015 · b483f41 · b483f41
1 parent d1c14d8
commit b483f41
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Collections.php b/framework/ActiveSync/lib/Horde/ActiveSync/Collections.php
@@ -960,6 +960,7 @@ public function checkFilterType($id, $filter)
         if (!empty($cc[$id]['filtertype']) &&
             !is_null($filter) &&
             $cc[$id]['filtertype'] != $filter) {
+            $this->_cache->updateFiltertype($id, $filter);
             return false;
         }
 

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php b/framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php
@@ -462,6 +462,19 @@ public function updateWindowSize($id, $windowsize)
         $this->_markCollectionsDirty($id);
     }
 
+    /**
+     * Update the filtertype for the specified collection.
+     *
+     * @param string $id           The collection id.
+     * @param integer $filtertype  The updated filtertype.
+     * @since 2.26.0
+     */
+    public function updateFiltertype($id, $filtertype)
+    {
+        $this->_data['collections'][$id]['filtertype'] = $filtertype;
+        $this->_markCollectionsDirty($id);
+    }
+
     /**
      * Clear all synckeys from the known collections.
      *