Merge pull request #1619 from JTNMW/mods

modification following #1541
bolt · Jul 10, 2020 · 6b07c28 · 6b07c28
2 parents a574714 + 2e70749
commit 6b07c28
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/Storage/SelectQuery.php b/src/Storage/SelectQuery.php
@@ -394,14 +394,12 @@ public function doFieldJoins(): void
                 $innerQuery->andWhere($fieldsAlias . '.name = :' . $keyParam);
                 $this->qb->setParameter($keyParam, $key);
             } else {
-                //added to include taxonomies to be searched as part of contenttype filter at the backend if anyField param is set.
+                //added to include taxonomies to be searched as part of contenttype filter at the backend and frontend if anyField param is set.
                 foreach ($filter->getParameters() as $value) {
-                    foreach ($this->getTaxonomyFields() as $key) {
-                        $innerQuery->innerJoin($contentAlias . '.taxonomies', 'taxonomies_' . $key);
-                        $this->qb->setParameter($key . '_1', $value);
-                        $filterExpression = sprintf('LOWER(taxonomies_%s.slug) LIKE :%s', $key, $key . '_1');
-                        $innerQuery->orWhere($filterExpression);
-                    }
+                    $innerQuery->innerJoin($contentAlias . '.taxonomies', 'taxonomies_' . $index);
+                    $this->qb->setParameter($key . '_1', $value);
+                    $filterExpression = sprintf('LOWER(taxonomies_%s.slug) LIKE :%s', $index, $key . '_1');
+                    $innerQuery->orWhere($filterExpression);
                 }
             }