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

Merge pull request #547 in ZP/z-push from bugfix/ZP-1239-wp-8.1-sends-client-changes-and-fetch to develop

* commit '141a425d':
  ZP-1239 Don't send server side changes if performing incoming actions.

src/lib/request/sync.php

@@ -631,7 +631,11 @@ class Sync extends RequestProcessor {
             foreach($sc as $folderid => $spa) {
                 // manually set getchanges parameter for this collection if it is synchronized
                 if ($spa->HasSyncKey()) {
-                    $sc->AddParameter($spa, "getchanges", true);
+                    $actiondata = $sc->GetParameter($spa, "actiondata");
+                    // request changes if no other actions are executed
+                    if (empty($actiondata["modifyids"]) && empty($actiondata["clientids"]) && empty($actiondata["removeids"])) {
+                        $sc->AddParameter($spa, "getchanges", true);
+                    }
 
                     // announce WindowSize to DeviceManager
                     self::$deviceManager->SetWindowSize($folderid, $spa->GetWindowSize());