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

Merge pull request #161 in ZP/z-push from bugfix/ZP-848-folderstat-should-not-be-considered to develop

* commit 'f0e80cd2':
  ZP-848 Remove folder stat if an older synckey is sent.

src/lib/request/sync.php

@@ -164,9 +164,12 @@ class Sync extends RequestProcessor {
                             $spa->RemoveSyncKey();
                             $spa->DelFolderStat();
                         }
-                        else if ($synckey !== false)
+                        else if ($synckey !== false && $synckey !== $spa->GetSyncKey()) {
+                            ZLog::Write(LOGLEVEL_DEBUG, "HandleSync(): Synckey does not match latest saved for this folder, removing folderstat to force Exporter setup");
+                            $spa->DelFolderStat();
                             $spa->SetSyncKey($synckey);
                         }
+                    }
                     catch (StateInvalidException $stie) {
                         $spa = new SyncParameters();
                         $status = SYNC_STATUS_INVALIDSYNCKEY;