Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 29 Sep 2016 08:45:48 +0000 (10:45 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 29 Sep 2016 08:45:48 +0000 (10:45 +0200)
Change-Id: I60c527853125a272ea7742146092a549294edd54

1  2 
tests/tine20/Calendar/Frontend/ActiveSyncTest.php
tine20/Calendar/Frontend/ActiveSync.php

@@@ -436,18 -484,18 +436,6 @@@ Zeile 3</AirSyncBase:Data
      </Sync>';
  
      /**
--     * Runs the test methods of this class.
--     *
--     * @access public
--     * @static
--     */
--    public static function main()
--    {
--        $suite  = new PHPUnit_Framework_TestSuite('Tine 2.0 ActiveSync Controller Calendar Tests');
--        PHPUnit_TextUI_TestRunner::run($suite);
--    }
--    
--    /**
       * (non-PHPdoc)
       * @see ActiveSync/ActiveSync_TestCase::setUp()
       */
@@@ -261,7 -261,7 +261,7 @@@ class Calendar_Frontend_ActiveSync exte
          $syncrotonEvent = new Syncroton_Model_Event();
          
          foreach ($this->_mapping as $syncrotonProperty => $tine20Property) {
--            if (empty($entry->$tine20Property) && $entry->$tine20Property != '0' || count($entry->$tine20Property) === 0) {
++            if ((empty($entry->$tine20Property) && $entry->$tine20Property != '0') || count($entry->$tine20Property) === 0) {
                  continue;
              }
              
                      
                  case 'attendee':
                      if ($this->_device->devicetype === Syncroton_Model_Device::TYPE_IPHONE &&
 +                        // note: might comparing an integer with a string here (at least with pgsql)
                          $this->_syncFolderId       != $this->_getDefaultContainerId()) {
--                        
-                         continue;
+                         break;
                      }
                      
                      // fill attendee cache