Revert "Do not blindly populate truncation data."

This reverts commit efac639c1e4adbfa63575983ee7eee2694afcd04.
horde · Nov 21, 2014 · 35655a2 · 35655a2
1 parent 6a01b7f
commit 35655a2
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php b/framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php
@@ -616,6 +616,14 @@ public function validateCollectionsFromCache(&$collections)
                 $collections[$key]['bodyprefs'] = $this->_data['collections'][$values['id']]['bodyprefs'];
                 $this->_markCollectionsDirty($key);
             }
+            if (empty($values['truncation']) && isset($this->_data['collections'][$values['id']]['truncation'])) {
+                $collections[$key]['truncation'] = $this->_data['collections'][$values['id']]['truncation'];
+                $this->_markCollectionsDirty($key);
+            }
+            if (empty($values['mimetruncation']) && isset($this->_data['collections'][$values['id']]['mimetruncation'])) {
+                $collections[$key]['mimetruncation'] = $this->_data['collections'][$values['id']]['mimetruncation'];
+                $this->_markCollectionsDirty($key);
+            }
             if (empty($values['serverid']) && isset($this->_data['collections'][$values['id']]['serverid'])) {
                 $collections[$key]['serverid'] = $this->_data['collections'][$values['id']]['serverid'];
                 $this->_markCollectionsDirty($key);