From 11858be4e8d5aba983700c6cba1c4d0a33ea8e9d Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 9 Apr 2016 22:42:17 -0400
Subject: Filter refactoring

---
 app/Controller/Search.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/Controller/Search.php')

diff --git a/app/Controller/Search.php b/app/Controller/Search.php
index 9b9b9e65..840a90c8 100644
--- a/app/Controller/Search.php
+++ b/app/Controller/Search.php
@@ -2,6 +2,8 @@
 
 namespace Kanboard\Controller;
 
+use Kanboard\Filter\TaskProjectsFilter;
+
 /**
  * Search controller
  *
@@ -23,14 +25,12 @@ class Search extends Base
                 ->setDirection('DESC');
 
         if ($search !== '' && ! empty($projects)) {
-            $query = $this
-                ->taskFilter
-                ->search($search)
-                ->filterByProjects(array_keys($projects))
-                ->getQuery();
-
             $paginator
-                ->setQuery($query)
+                ->setQuery($this->taskLexer
+                    ->build($search)
+                    ->withFilter(new TaskProjectsFilter(array_keys($projects)))
+                    ->getQuery()
+                )
                 ->calculate();
 
             $nb_tasks = $paginator->getTotal();
-- 
cgit v1.2.3