Commit 02f05d29 authored by Sebastian Kummer's avatar Sebastian Kummer

Merge pull request #367 in ZP/z-push from...

Merge pull request #367 in ZP/z-push from bugfix/ZP-1045-changed-contacts-in-outlook-are-not to develop

* commit 'df29b821':
  ZP-1045 Only ignore KOE email updates.
parents fb12c9f5 df29b821
...@@ -417,7 +417,7 @@ class ImportChangesICS implements IImportChanges { ...@@ -417,7 +417,7 @@ class ImportChangesICS implements IImportChanges {
} }
// KOE ZP-990: OL updates the deleted category which causes a race condition if more than one KOE is connected to that user // KOE ZP-990: OL updates the deleted category which causes a race condition if more than one KOE is connected to that user
if(ZPush::GetDeviceManager()->IsKoe() && KOE_CAPABILITY_RECEIVEFLAGS && !isset($message->flag) && isset($message->categories)) { if(ZPush::GetDeviceManager()->IsKoe() && KOE_CAPABILITY_RECEIVEFLAGS && $message instanceof SyncMail && !isset($message->flag) && isset($message->categories)) {
// check if the categories changed // check if the categories changed
$mapiCategories = $this->mapiprovider->GetMessageCategories($props[PR_PARENT_SOURCE_KEY], $props[PR_SOURCE_KEY]); $mapiCategories = $this->mapiprovider->GetMessageCategories($props[PR_PARENT_SOURCE_KEY], $props[PR_SOURCE_KEY]);
if( (empty($message->categories) && empty($mapiCategories)) || if( (empty($message->categories) && empty($mapiCategories)) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment