Commit a3bf653d authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-1069 Ignore incoming KOE reply flag category update.

Released under the Affero GNU General Public License (AGPL) version 3.
parent ef0402e3
......@@ -276,6 +276,16 @@ class ReplyBackImExporter implements IImportChanges, IExportChanges {
ZLog::Write(LOGLEVEL_DEBUG, "ReplyBackImExporter->ImportMessageChange(): KOE patch item update. Ignoring incoming update.");
return true;
}
// KOE ZP-990: OL updates the deleted category which causes a race condition if more than one KOE is connected to that user
if (KOE_CAPABILITY_RECEIVEFLAGS && $message instanceof SyncMail && !isset($message->flag) && isset($message->categories)) {
// check if the categories changed
$serverMessage = $this->getMessage($id, false);
if((empty($message->categories) && empty($serverMessage->categories)) ||
(is_array($mapiCategories) && count(array_diff($mapiCategories, $message->categories)) == 0 && count(array_diff($message->categories, $mapiCategories)) == 0)) {
ZLog::Write(LOGLEVEL_DEBUG, "ReplyBackImExporter->ImportMessageChange(): KOE update of flag categories. Ignoring incoming update.");
return true;
}
}
}
// data is going to be dropped, inform the user
......
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