From 671c8b734d405964d2ceb498afc18a77ced3bffb Mon Sep 17 00:00:00 2001 From: Stig Lindqvist Date: Fri, 9 Dec 2011 12:49:24 +0100 Subject: [PATCH] BUGFIX NegationFilter and SubstringFilter did not set the DataModel on apply() --- search/filters/NegationFilter.php | 1 + search/filters/SubstringFilter.php | 1 + 2 files changed, 2 insertions(+) mode change 100644 => 100755 search/filters/NegationFilter.php mode change 100644 => 100755 search/filters/SubstringFilter.php diff --git a/search/filters/NegationFilter.php b/search/filters/NegationFilter.php old mode 100644 new mode 100755 index 110093e3e..09eaba53a --- a/search/filters/NegationFilter.php +++ b/search/filters/NegationFilter.php @@ -8,6 +8,7 @@ class NegationFilter extends SearchFilter { public function apply(DataQuery $query) { + $this->model = $query->applyRelation($this->relation); return $query->where(sprintf( "%s != '%s'", $this->getDbName(), diff --git a/search/filters/SubstringFilter.php b/search/filters/SubstringFilter.php old mode 100644 new mode 100755 index 965413270..2c8e7df14 --- a/search/filters/SubstringFilter.php +++ b/search/filters/SubstringFilter.php @@ -13,6 +13,7 @@ class SubstringFilter extends SearchFilter { public function apply(DataQuery $query) { + $this->model = $query->applyRelation($this->relation); return $query->where(sprintf( "LOCATE('%s', %s) != 0", Convert::raw2sql($this->getValue()),