Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX] Filter null collections #1461

Merged
merged 1 commit into from
Feb 4, 2025
Merged

[BUGFIX] Filter null collections #1461

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Classes/Common/Solr/SolrSearch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,9 @@ private function getCollectionFilterQuery(string $query) : string
{
$collectionsQueryString = '';
$virtualCollectionsQueryString = '';

$this->filterCollections();

foreach ($this->collections as $collection) {
// check for virtual collections query string
if ($collection->getIndexSearch()) {
Expand Down Expand Up @@ -808,6 +811,18 @@ private function getCollectionFilterQuery(string $query) : string
return implode(' OR ', array_filter([$collectionsQueryString, $virtualCollectionsQueryString]));
}

/**
* Filter collections to avoid null values.
*
* @return void
*/
private function filterCollections(): void
{
if (is_array($this->collections)) {
array_filter($this->collections, fn($value) => $value !== null);
}
}

/**
* Get sort order of the results as given or by title as default.
*
Expand Down