Commit 24f4523a authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-622 Reset the backend store before getting the HierarchyExporter.

Don't include hierarchy in the listed ping classes.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 0df33f3f
......@@ -469,7 +469,7 @@ class SyncCollections implements Iterator {
public function CheckForChanges($lifetime = 600, $interval = 30, $onlyPingable = false) {
$classes = array();
foreach ($this->collections as $folderid => $spa){
if ($onlyPingable && $spa->GetPingableFlag() !== true)
if ($onlyPingable && $spa->GetPingableFlag() !== true || ! $folderid)
continue;
if (!isset($classes[$spa->GetContentClass()]))
......@@ -717,6 +717,8 @@ class SyncCollections implements Iterator {
$changecount = false;
if ($exportChanges || $this->hierarchyExporterChecked === false) {
try {
// reset backend to the main store
ZPush::GetBackend()->Setup(false);
$changesMem = ZPush::GetDeviceManager()->GetHierarchyChangesWrapper();
// the hierarchyCache should now fully be initialized - check for changes in the additional folders
......
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