Commit 8e720815 authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-1060 Before ignoring SyncNote changes make sure they're coming from

KOE and the notes capability is enabled.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 0c12c207
...@@ -270,11 +270,13 @@ class ReplyBackImExporter implements IImportChanges, IExportChanges { ...@@ -270,11 +270,13 @@ class ReplyBackImExporter implements IImportChanges, IExportChanges {
* @return boolean * @return boolean
*/ */
public function ImportMessageChange($id, $message) { public function ImportMessageChange($id, $message) {
if(ZPush::GetDeviceManager()->IsKoe()) {
// Ignore incoming update events of KOE caused by PatchItem - ZP-1060 // Ignore incoming update events of KOE caused by PatchItem - ZP-1060
if ($id && $message instanceof SyncNote && !isset($message->asbody)) { if (KOE_CAPABILITY_NOTES && $id && $message instanceof SyncNote && !isset($message->asbody)) {
ZLog::Write(LOGLEVEL_DEBUG, "ReplyBackImExporter->ImportMessageChange(): KOE patch item update. Ignoring incoming update."); ZLog::Write(LOGLEVEL_DEBUG, "ReplyBackImExporter->ImportMessageChange(): KOE patch item update. Ignoring incoming update.");
return true; return true;
} }
}
// data is going to be dropped, inform the user // data is going to be dropped, inform the user
if (@constant('READ_ONLY_NOTIFY_LOST_DATA')) { if (@constant('READ_ONLY_NOTIFY_LOST_DATA')) {
......
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