Fixed removing inclusive filters in getCollection

This commit is contained in:
Czcibor Bohusz-Dobosz 2021-02-10 03:58:38 +01:00 committed by Matias Griese
parent 13f8b65e08
commit 45cea4fc4b

View File

@ -449,7 +449,6 @@ class Pages
}
}
// Remove any inclusive sets from filter.
$filters = $params['filter'] ?? [];
// Assume published=true if not set.
@ -457,6 +456,15 @@ class Pages
$filters['published'] = true;
}
// Remove any inclusive sets from filter.
$sets = ['published', 'visible', 'modular', 'routable'];
foreach ($sets as $type) {
$var = "non-{$type}";
if (isset($filters[$type], $filters[$var]) && $filters[$type] && $filters[$var]) {
unset($filters[$type], $filters[$var]);
}
}
// Filter the collection
foreach ($filters as $type => $filter) {
// Convert non-type to type.