Commit 2ccb6a09 authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-923 Don't load collection if the synckey has counter 0 (zero synckey

used for movestates). 

Released under the Affero GNU General Public License (AGPL) version 3.
parent 42bf4255
......@@ -183,8 +183,14 @@ 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
......
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