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

Merge pull request #140 in ZP/z-push from bugfix/ZP-826-ping-triggers-hierarchy-sync-when to develop

* commit '49773be6':
  ZP-826 Force synchronization of folder if there is an unknown error on exporter setup.

(cherry picked from commit f9e71d7f)

src/lib/core/synccollections.php

@@ -629,6 +629,11 @@ class SyncCollections implements Iterator {
             }
         }
         catch (StatusException $ste) {
+            if ($ste->getCode() == SYNC_STATUS_FOLDERHIERARCHYCHANGED) {
+                ZLog::Write(LOGLEVEL_WARN, "SyncCollections->CountChange(): exporter can not be re-configured due to state error, emulating change in folder to force Sync.");
+                $this->changes[$folderid] = 1;
+                return true;
+            }
             throw new StatusException("SyncCollections->CountChange(): exporter can not be re-configured.", self::ERROR_WRONG_HIERARCHY, null, LOGLEVEL_WARN);
         }
 
@@ -758,4 +763,4 @@ class SyncCollections implements Iterator {
      }
 }
 
-?>
+?>
\ No newline at end of file