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

Merge pull request #229 in ZP/z-push from bugfix/ZP-923-ping-fails-to-load-state-for-zero to develop

* commit '2ccb6a09':
  ZP-923 Don't load collection if the synckey has counter 0 (zero synckey used for movestates).

src/lib/core/synccollections.php

@@ -183,9 +183,15 @@ class SyncCollections implements Iterator {
 
             // TODO remove resync of folders for < Z-Push 2 beta4 users
             // this forces a resync of all states previous to Z-Push 2 beta4
-            if (! $spa instanceof SyncParameters)
+            if (! $spa instanceof SyncParameters) {
                 throw new StateInvalidException("Saved state are not of type SyncParameters");
             }
+
+            if ($spa->GetUuidCounter() == 0) {
+                ZLog::Write(LOGLEVEL_DEBUG, "SyncCollections->LoadCollection(): Found collection with move state only, ignoring.");
+                return true;
+            }
+        }
         catch (StateInvalidException $sive) {
             // in case there is something wrong with the state, just stop here
             // later when trying to retrieve the SyncParameters nothing will be found