Revert "Merge pull request #66 in ZP/z-push from...

Revert "Merge pull request #66 in ZP/z-push from bugfix/ZP-724-contact-s-birthday-is-not-updated to develop"

This reverts commit db7d11d4.

src/lib/syncobjects/syncmeetingrequestrecurrence.php

@@ -56,7 +56,6 @@ class SyncMeetingRequestRecurrence extends SyncObject {
     public $dayofmonth;
     public $weekofmonth;
     public $monthofyear;
-    public $calendartype;
 
     function SyncMeetingRequestRecurrence() {
         $mapping = array (
@@ -115,10 +114,6 @@ class SyncMeetingRequestRecurrence extends SyncObject {
                                                                                     self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_ONEVALUEOF => array(1,2,3,4,5,6,7,8,9,10,11,12) )),
                 );
 
-        if(Request::GetProtocolVersion() >= 14.0) {
-            $mapping[SYNC_POOMMAIL2_CALENDARTYPE]                       = array (   self::STREAMER_VAR      => "calendartype");
-        }
-
         parent::SyncObject($mapping);
     }
 }

src/lib/syncobjects/syncrecurrence.php

@@ -56,7 +56,6 @@ class SyncRecurrence extends SyncObject {
     public $dayofmonth;
     public $weekofmonth;
     public $monthofyear;
-    public $calendartype;
 
     function SyncRecurrence() {
         $mapping = array (
@@ -115,10 +114,6 @@ class SyncRecurrence extends SyncObject {
                                                                                     self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_ONEVALUEOF => array(1,2,3,4,5,6,7,8,9,10,11,12) )),
                 );
 
-        if(Request::GetProtocolVersion() >= 14.0) {
-            $mapping[SYNC_POOMCAL_CALENDARTYPE]                         = array (   self::STREAMER_VAR      => "calendartype");
-        }
-
         parent::SyncObject($mapping);
     }
 }

src/lib/syncobjects/synctaskrecurrence.php

@@ -59,7 +59,6 @@ class SyncTaskRecurrence extends SyncObject {
     public $monthofyear;
     public $regenerate;
     public $deadoccur;
-    public $calendartype;
 
     function SyncTaskRecurrence() {
         $mapping = array (
@@ -122,12 +121,8 @@ class SyncTaskRecurrence extends SyncObject {
                     // 1-12 representing the month
                     SYNC_POOMTASKS_MONTHOFYEAR                          => array (  self::STREAMER_VAR      => "monthofyear",
                                                                                     self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_ONEVALUEOF => array(1,2,3,4,5,6,7,8,9,10,11,12) )),
-                );
-
-        if(Request::GetProtocolVersion() >= 14.0) {
-            $mapping[SYNC_POOMTASKS_CALENDARTYPE]                       = array (   self::STREAMER_VAR      => "calendartype");
-        }
 
+                );
         parent::SyncObject($mapping);
     }