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

Merge pull request #796 from stozze/3.0-bugfix

Browse Source 
BUGFIX Fix to prevent unintended results from getComponentsQuery(...)
This commit is contained in:
Sam Minnée 2012-09-17 18:26:44 -07:00
commit 95dbad6195
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 // get filter
$combinedFilter = "\"$joinField\" = '$id'"; $combinedFilter = "\"$joinField\" = '$id'";
if($filter) $combinedFilter .= " AND {$filter}"; if(!empty($filter)) $combinedFilter .= " AND ({$filter})";
return singleton($componentClass)->extendedSQL($combinedFilter, $sort, $limit, $join); return singleton($componentClass)->extendedSQL($combinedFilter, $sort, $limit, $join);
} }