Pass the device object.

No idea how this wasn't in master. Was in a local topic branch that I *thought* was branched from master. Probably some merge error from when we had the seperate branches...
horde · Mar 24, 2014 · 8956d9a · 8956d9a
1 parent ce23746
commit 8956d9a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/framework/Core/lib/Horde/Core/ActiveSync/Connector.php b/framework/Core/lib/Horde/Core/ActiveSync/Connector.php
@@ -256,6 +256,7 @@ public function contacts_listUids($source = null)
      *                DEFAULT: none (No body prefs enforced).
      *   - truncation: (integer)  Truncate event body to this length
      *                 DEFAULT: none (No truncation).
+     *   - device: (Horde_ActiveSync_Device) The device object.
      *
      * @return Horde_ActiveSync_Message_Contact  The contact object.
      */

diff --git a/framework/Core/lib/Horde/Core/ActiveSync/Driver.php b/framework/Core/lib/Horde/Core/ActiveSync/Driver.php
@@ -1200,7 +1200,8 @@ public function getMessage($folderid, $id, array $collection)
                     'protocolversion' => $this->_version,
                     'truncation' => $collection['truncation'],
                     'bodyprefs' => $this->addDefaultBodyPrefTruncation($collection['bodyprefs']),
-                    'mimesupport' => $collection['mimesupport']));
+                    'mimesupport' => $collection['mimesupport'],
+                    'device' => $this->_device));
             } catch (Horde_Exception $e) {
                 $this->_logger->err($e->getMessage());
                 $this->_endBuffer();