From c470ff8640844dc723f4be520bb5c900bf3a9f62 Mon Sep 17 00:00:00 2001 From: pollen8 Date: Tue, 19 Nov 2013 10:35:16 +0100 Subject: [PATCH] enabled IN conditions in list query string filters --- components/com_fabrik/models/listfilter.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/com_fabrik/models/listfilter.php b/components/com_fabrik/models/listfilter.php index 29bb53da51f..fea52ea81d4 100644 --- a/components/com_fabrik/models/listfilter.php +++ b/components/com_fabrik/models/listfilter.php @@ -936,6 +936,7 @@ private function getSearchFormFilters(&$filters) } } } + /** * unset the search form id so we wont reuse the search data * untill a new search is performed @@ -1029,7 +1030,7 @@ private function getQuerystringFilters(&$filters) * do a ranged querystring search with this syntax * ?element_test___time_date[value][]=2009-08-07&element_test___time_date[value][]=2009-08-10&element_test___time_date[condition]=BETWEEN */ - if (is_array($value) && $condition != 'BETWEEN') + if (is_array($value) && $condition != 'BETWEEN' && strtoupper($condition) !== 'IN') { // If we aren't doing a ranged search foreach ($value as $vk => $avalue) @@ -1510,7 +1511,7 @@ private function getSessionFilters(&$filters) $sqlCond = null; $condition = array_key_exists($i, $sessionfilters['condition']) ? $sessionfilters['condition'][$i] : $elementModel->getDefaultFilterCondition(); - $origCondition = array_key_exists($i, $sessionfilters['orig_condition']) ? $sessionfilters['orig_condition'][$i] + $origCondition = array_key_exists('orig_condition', $sessionfilters) && array_key_exists($i, $sessionfilters['orig_condition']) ? $sessionfilters['orig_condition'][$i] : $elementModel->getDefaultFilterCondition(); $raw = array_key_exists($i, $sessionfilters['raw']) ? $sessionfilters['raw'][$i] : 0; $eval = array_key_exists($i, $sessionfilters['eval']) ? $sessionfilters['eval'][$i] : FABRIKFILTER_TEXT;