Prevent error on sorting

effective-webwork · Dec 3, 2024 · ddf7e74 · ddf7e74
1 parent 25ed4ae
commit ddf7e74
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/Classes/Common/Solr/SolrSearch.php b/Classes/Common/Solr/SolrSearch.php
@@ -748,11 +748,13 @@ private function getCollectionFilterQuery(string $query) : string
         $collectionsQueryString = '';
         $virtualCollectionsQueryString = '';
         foreach ($this->collections as $collection) {
-            // check for virtual collections query string
-            if ($collection->getIndexSearch()) {
-                $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collection->getIndexSearch() . ')' : ' OR (' . $collection->getIndexSearch() . ')';
-            } else {
-                $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collection->getIndexName() . '"' : ' OR "' . $collection->getIndexName() . '"';
+            if ($collection !== null) {
+                // check for virtual collections query string
+                if ($collection->getIndexSearch()) {
+                    $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collection->getIndexSearch() . ')' : ' OR (' . $collection->getIndexSearch() . ')';
+                } else {
+                    $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collection->getIndexName() . '"' : ' OR "' . $collection->getIndexName() . '"';
+                }
             }
         }
 

diff --git a/Classes/Controller/SearchController.php b/Classes/Controller/SearchController.php
@@ -400,10 +400,12 @@ private function addCollectionsQuery(string $query): string
             $virtualCollectionsQueryString = '';
             foreach ($collections as $collectionEntry) {
                 // check for virtual collections query string
-                if ($collectionEntry->getIndexSearch()) {
-                    $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR (' . $collectionEntry->getIndexSearch() . ')';
-                } else {
-                    $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collectionEntry->getIndexName() . '"' : ' OR "' . $collectionEntry->getIndexName() . '"';
+                if ($collectionEntry !== null) {
+                    if ($collectionEntry->getIndexSearch()) {
+                        $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR (' . $collectionEntry->getIndexSearch() . ')';
+                    } else {
+                        $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collectionEntry->getIndexName() . '"' : ' OR "' . $collectionEntry->getIndexName() . '"';
+                    }
                 }
             }