This is a property of the Meeting Request, not the Email object.

horde · Dec 15, 2014 · c07b2fe · c07b2fe
1 parent 58b39a3
commit c07b2fe
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Mail.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Mail.php
@@ -138,6 +138,8 @@ class Horde_ActiveSync_Message_Mail extends Horde_ActiveSync_Message_Base
     const POOMMAIL2_ISLEAPMONTH           = 'POOMMAIL2:IsLeapMonth';
     const POOMMAIL2_ACCOUNTID             = 'POOMMAIL2:AccountId';
     const POOMMAIL2_FIRSTDAYOFWEEK        = 'POOMMAIL2:FirstDayOfWeek';
+
+    // EAS 14.1
     const POOMMAIL2_MEETINGMESSAGETYPE    = 'POOMMAIL2:MeetingMessageType';
 
     /* Mail message types */
@@ -270,8 +272,7 @@ public function __construct(array $options = array())
                     self::POOMMAIL2_CALENDARTYPE          => array(self::KEY_ATTRIBUTE => 'calendartype'),
                     self::POOMMAIL2_ISLEAPMONTH           => array(self::KEY_ATTRIBUTE => 'isleapmonth'),
                     self::POOMMAIL2_ACCOUNTID             => array(self::KEY_ATTRIBUTE => 'accountid'),
-                    self::POOMMAIL2_FIRSTDAYOFWEEK        => array(self::KEY_ATTRIBUTE => 'firstdayofweek'),
-                    self::POOMMAIL2_MEETINGMESSAGETYPE    => array(self::KEY_ATTRIBUTE => 'meetingmessagetype')
+                    self::POOMMAIL2_FIRSTDAYOFWEEK        => array(self::KEY_ATTRIBUTE => 'firstdayofweek')
                 );
 
                 $this->_properties += array(
@@ -289,7 +290,6 @@ public function __construct(array $options = array())
                    'isleapmonth'           => false,
                    'accountid'             => false,
                    'firstdayofweek'        => false,
-                   'meetingmessagetype'    => false,
                    'categories'            => array(),
 
                    // Internal use

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/MeetingRequest.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/MeetingRequest.php
@@ -104,6 +104,24 @@ class Horde_ActiveSync_Message_MeetingRequest extends Horde_ActiveSync_Message_B
      */
     protected $_vEvent;
 
+    /**
+     * Const'r
+     *
+     * @see Horde_ActiveSync_Message_Base::__construct()
+     */
+    public function __construct(array $options = array())
+    {
+        parent::__construct($options);
+        if ($this->_version > Horde_ActiveSync::VERSION_FOURTEEN) {
+            $this->_mapping += array(
+                Horde_ActiveSync_Message_Mail::POOMMAIL2_MEETINGMESSAGETYPE  => array(self::KEY_ATTRIBUTE => 'meetingmessagetype')
+            );
+            $this->_properties += array(
+                'meetingmessagetype' => false
+            );
+        }
+    }
+
     /**
      * Create a meeting request from a vEvent.
      *