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

[Aleksander Machniak]

 lib/kolab_sync_data_email.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 95c9c123b9b500ac4023cfc6878da4307e8fb179
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri Aug 22 19:07:36 2014 -0400

    Fix email flag synchronization issues (#3492)

diff --git a/lib/kolab_sync_data_email.php b/lib/kolab_sync_data_email.php
index 205d3da..b032f7d 100644
--- a/lib/kolab_sync_data_email.php
+++ b/lib/kolab_sync_data_email.php
@@ -579,13 +579,13 @@ class kolab_sync_data_email extends kolab_sync_data implements Syncroton_Data_ID
         }
 
         // Flag change
-        if (empty($entry->flag)) {
+        if (empty($entry->flag) || empty($entry->flag->flagType)) {
             if ($is_flagged) {
                 $this->storage->set_flag($msg['uid'], 'UNFLAGGED', $msg['foldername']);
             }
         }
         else if (!$is_flagged && !empty($entry->flag)) {
-            if ($entry->flag->flagType && preg_match('/^follow\s*up/i', $entry->flag->flagType)) {
+            if ($entry->flag->flagType && preg_match('/follow\s*up/i', $entry->flag->flagType)) {
                 $this->storage->set_flag($msg['uid'], 'FLAGGED', $msg['foldername']);
             }
         }