summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2014-08-22 23:07:36 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2014-08-22 23:07:36 (GMT)
commit05facb6dce339b4dca008db4b38d1aba194ef851 (patch)
treec7e38577a283aa4ab649b896a8dfb4f4b0b39251
parent366774a0afe6531cadd0c0ba6f79985c11bdd09d (diff)
downloadkolab-syncroton-05facb6dce339b4dca008db4b38d1aba194ef851.tar.gz
Fix email flag synchronization issues (#3492)
-rw-r--r--lib/kolab_sync_data_email.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kolab_sync_data_email.php b/lib/kolab_sync_data_email.php
index 5ccd031..4fb436a 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']);
}
}