lib/kolab_sync_backend_device.php

[Aleksander Machniak]

 lib/kolab_sync_backend_device.php |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 83f12d8a4e416fc532eea1d13bd3f381d4081c05
Author: Aleksander Machniak <alec at alec.pl>
Date:   Tue Sep 18 15:19:28 2012 +0200

    Fix error when connecting after removing device from the list in Roundcube

diff --git a/lib/kolab_sync_backend_device.php b/lib/kolab_sync_backend_device.php
index 91adb54..c8cc7be 100644
--- a/lib/kolab_sync_backend_device.php
+++ b/lib/kolab_sync_backend_device.php
@@ -82,13 +82,10 @@ class kolab_sync_backend_device extends kolab_sync_backend_common implements Syn
      */
     public function delete($device)
     {
-        $result = $this->backend->device_delete($device->deviceid);
+        // Update IMAP annotation
+        $this->backend->device_delete($device->deviceid);
 
-        if ($result) {
-            $result = parent::delete($device);
-        }
-
-        return $result;
+        return parent::delete($device);
     }
 
     /**