Merge branch '2013.10' into 2014.11
[tine20] / tine20 / Calendar / Setup / Update / Release8.php
index 9611bc9..92bae4b 100644 (file)
@@ -459,11 +459,15 @@ class Calendar_Setup_Update_Release8 extends Setup_Update_Abstract
         $deviceBackend = new ActiveSync_Backend_Device();
         $usersWithiPhones = $deviceBackend->search(new ActiveSync_Model_DeviceFilter(array(
             'devicetype' => 'iphone'
-        )), NULL, 'owner_id');
+        )))->owner_id;
 
         $activeSyncController = ActiveSync_Controller::getInstance();
         foreach($usersWithiPhones as $userId) {
-            $activeSyncController->resetSyncForUser($userId, 'Calendar');
+            try {
+                $activeSyncController->resetSyncForUser($userId, 'Calendar');
+            } catch (Exception $e) {
+                Tinebase_Exception::log($e, /* suppress trace */ false);
+            }
         }
 
         $this->setApplicationVersion('Calendar', '8.11');