tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-06 01:31:22 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #795 from theorytank/3.0

Browse Source 
FIX: collateFamilyIDs() nested groups throws error
This commit is contained in:
Will Rossiter 2012-09-14 14:20:26 -07:00
commit 86dc36ca21
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
security/Group.php
View File

@ -271,15 +271,11 @@ class Group extends DataObject {
*/ */
public function collateFamilyIDs() { public function collateFamilyIDs() {
$familyIDs = array(); $familyIDs = array();
$chunkToAdd = array(array("ID" => $this->ID)); $chunkToAdd = array($this->ID);
while($chunkToAdd) { while($chunkToAdd) {
$idList = array(); $familyIDs = array_merge($familyIDs,$chunkToAdd);
foreach($chunkToAdd as $item) { $idList = implode(',', $chunkToAdd);
$idList[] = $item['ID'];
$familyIDs[] = $item['ID'];
}
$idList = implode(',', $idList);
// Get the children of *all* the groups identified in the previous chunk. // Get the children of *all* the groups identified in the previous chunk.
// This minimises the number of SQL queries necessary // This minimises the number of SQL queries necessary