tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-02 14:18:47 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #277 from silverstripe-rebelalliance/open/8183

Browse Source 
BUG: Replaced extendedSQL with DataList as per ticket 8183
This commit is contained in:
Ingo Schommer 2013-01-23 12:58:51 -08:00
commit 6a4387b970
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/model/SiteTreeFolderExtension.php
View File

@ -19,14 +19,14 @@ class SiteTreeFolderExtension extends DataExtension {
} }
foreach($classes as $className) { foreach($classes as $className) {
$query = singleton($className)->extendedSQL(); $query = new DataQuery($className);
$ids = $query->execute()->column(); $ids = $query->execute()->column();
if(!count($ids)) continue; if(!count($ids)) continue;
foreach(singleton($className)->has_one() as $relName => $joinClass) { foreach(singleton($className)->has_one() as $relName => $joinClass) {
if($joinClass == 'Image' || $joinClass == 'File') { if($joinClass == 'Image' || $joinClass == 'File') {
$fieldName = $relName .'ID'; $fieldName = $relName .'ID';
$query = singleton($className)->extendedSQL("$fieldName > 0"); $query = DataList::create($className)->where("$fieldName > 0");
$query->distinct = true; $query->distinct = true;
$query->select(array($fieldName)); $query->select(array($fieldName));
$usedFiles = array_merge($usedFiles, $query->execute()->column()); $usedFiles = array_merge($usedFiles, $query->execute()->column());