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

Merge pull request #466 in ZP/z-push from bugfix/ZP-1157-unexpected-synckey-with-partial-sync to develop

* commit '14c1b661':
  ZP-1157 Reload state and initialize StateMachine again when synching a partial requested folder.

src/lib/request/sync.php

@@ -748,8 +748,12 @@ class Sync extends RequestProcessor {
                 continue;
             }
 
-            if (! $sc->GetParameter($spa, "requested"))
+            if (! $sc->GetParameter($spa, "requested")) {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("HandleSync(): partial sync for folder class '%s' with id '%s'", $spa->GetContentClass(), $spa->GetFolderId()));
+                // reload state and initialize StateMachine correctly
+                $sc->AddParameter($spa, "state", null);
+                $status = $this->loadStates($sc, $spa, $actiondata);
+            }
 
             // initialize exporter to get changecount
             $changecount = false;