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

BUGFIX Convert pages from DataList to ArrayList in CMSBatchActionHandler to avoid problems on merge()

Browse Source
This commit is contained in:
Ingo Schommer 2012-03-09 00:17:48 +01:00
parent d04fe07fa6
commit 64db811d65
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/code/CMSBatchActionHandler.php
View File

@ -111,8 +111,14 @@ class CMSBatchActionHandler extends RequestHandler {
implode(", ", $idsFromLive) implode(", ", $idsFromLive)
); );
$livePages = Versioned::get_by_stage($this->recordClass, 'Live', $sql); $livePages = Versioned::get_by_stage($this->recordClass, 'Live', $sql);
if($pages) $pages->merge($livePages); if($pages) {
else $pages = $livePages; // Can't merge into a DataList, need to condense into an actual list first
// (which will retrieve all records as objects, so its an expensive operation)
$pages = new ArrayList($pages->toArray());
$pages->merge($livePages);
} else {
$pages = $livePages;
}
} }
} }
} else { } else {