Only save the properties, not deviceInfo when $all is true.

horde · May 19, 2014 · 26c8ff9 · 26c8ff9
1 parent e0c99d4
commit 26c8ff9
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Device.php b/framework/ActiveSync/lib/Horde/ActiveSync/Device.php
@@ -325,10 +325,18 @@ public function getLastSyncTimestamp()
 
     /**
      * Save the dirty device info data.
+     *
+     * @param boolean $all  If true, save all properties (deviceInfo and
+     *                      deviceProperties). Otherwise, just save dirty
+     *                      deviceProperties. @since 2.16.0
+     * @todo For 3.0, make it clearer taht deviceInfo is per-user and
+     *       deviceProperties is per-device.
      */
-    public function save()
+    public function save($all = true)
     {
-        $this->_state->setDeviceInfo($this, $this->_dirty);
+        if ($all) {
+            $this->_state->setDeviceInfo($this, $this->_dirty);
+        }
         if (!empty($this->_dirty['properties'])) {
             $this->_state->setDeviceProperties($this->properties, $this->id);
         }