Branch 'kolab-syncroton-2.2' - lib/kolab_sync_data_email.php

[Aleksander Machniak]

 lib/kolab_sync_data_email.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 56f9a7ec1a20a14fbbda2a08f0984d7d8c312f8a
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Mon Aug 25 15:54:50 2014 -0400

    Fix Flag element handling on updates (again).
    
    There was still an issue with that. In case when flagged message was
    read on a device the read status was updated but also the flag was removed.

diff --git a/lib/kolab_sync_data_email.php b/lib/kolab_sync_data_email.php
index c305e2b..74fa565 100644
--- a/lib/kolab_sync_data_email.php
+++ b/lib/kolab_sync_data_email.php
@@ -579,7 +579,7 @@ class kolab_sync_data_email extends kolab_sync_data implements Syncroton_Data_ID
         }
 
         // Flag change
-        if (empty($entry->flag) || empty($entry->flag->flagType)) {
+        if (isset($entry->flag) && (empty($entry->flag) || empty($entry->flag->flagType))) {
             if ($is_flagged) {
                 $this->storage->set_flag($msg['uid'], 'UNFLAGGED', $msg['foldername']);
             }