We can't assume that the taxonomy is held in data now

statamic · Nov 13, 2024 · 7d71138 · 7d71138
1 parent 8ce0c04
commit 7d71138
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Taxonomies/TermQueryBuilder.php b/src/Taxonomies/TermQueryBuilder.php
@@ -245,7 +245,7 @@ private function applyCollectionAndTaxonomyWheres()
                                     $query->select(DB::raw(1))
                                         ->from($entriesTable)
                                         ->whereIn('collection', $this->collections)
-                                        ->whereJsonContains("data->{$taxonomy}", $value);
+                                        ->whereJsonContains(Entry::query()->column($taxonomy->handle()), $value);
                                 })
                                 ->pluck('slug');
                         }
@@ -256,7 +256,7 @@ private function applyCollectionAndTaxonomyWheres()
                             ->map(function ($term) use ($taxonomy) {
                                 return Entry::query()
                                     ->whereIn('collection', $this->collections)
-                                    ->whereJsonContains('data->'.$taxonomy, [$term->slug])
+                                    ->whereJsonContains($taxonomy->handle(), [$term->slug])
                                     ->count() > 0 ? $term->slug : null;
                             })
                             ->filter()