tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-01 05:39:10 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Fix to prevent unintended results from getComponentsQuery(...)

Browse Source 
Wrapped $filter inside parentheses to prevent unintended results if $filter contains "OR".
This commit is contained in:
stozze 2012-09-14 18:05:17 +03:00 committed by Stozze
parent 7a8c35f4e3
commit 499b7c9ff9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model/DataObject.php
View File

@ -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);
}