From 499b7c9ff9d2872a0708a526ea683670bbad2a96 Mon Sep 17 00:00:00 2001 From: stozze Date: Fri, 14 Sep 2012 18:05:17 +0300 Subject: [PATCH] BUGFIX Fix to prevent unintended results from getComponentsQuery(...) Wrapped $filter inside parentheses to prevent unintended results if $filter contains "OR". --- model/DataObject.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/DataObject.php b/model/DataObject.php index baf21d144..3b033b4bc 100644 --- a/model/DataObject.php +++ b/model/DataObject.php @@ -1359,7 +1359,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity // get filter $combinedFilter = "\"$joinField\" = '$id'"; - if($filter) $combinedFilter .= " AND {$filter}"; + if(!empty($filter)) $combinedFilter .= " AND ({$filter})"; return singleton($componentClass)->extendedSQL($combinedFilter, $sort, $limit, $join); }