From fa61805df2d8df0d4847fc0fa3c7de52d38ac352 Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Fri, 2 Jun 2017 14:57:10 +0200 Subject: [PATCH] QuickTable: Fix enforced filters for non-FilterAnd filters We need to use the result of andFilter() as the new Filter. The filter gets replaced by FilterAnd($oldFilter, $enforcedFilter) here. --- library/Director/Web/Table/QuickTable.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Director/Web/Table/QuickTable.php b/library/Director/Web/Table/QuickTable.php index d4a90496..73bba910 100644 --- a/library/Director/Web/Table/QuickTable.php +++ b/library/Director/Web/Table/QuickTable.php @@ -195,7 +195,7 @@ abstract class QuickTable implements Paginatable } if ($filter) { foreach ($enforced as $f) { - $filter->andFilter($f); + $filter = $filter->andFilter($f); } $query->where($this->renderFilter($filter)); }