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 #7129 from mfendeksilverstripe/master

Browse Source 
Limited nodes with too many children are no longer accessible
This commit is contained in:
Daniel Hensby 2017-07-05 12:37:26 +01:00 committed by GitHub
commit aafa054cf7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ORM/Hierarchy/MarkedSet.php
View File

@ -407,13 +407,14 @@ class MarkedSet
// Build root rode
$expanded = $this->isExpanded($node);
$opened = $this->isTreeOpened($node);
$count = ($limited && $numChildren > $this->getMaxChildNodes()) ? 0 : $numChildren;
$output = [
'node' => $node,
'marked' => $this->isMarked($node),
'expanded' => $expanded,
'opened' => $opened,
'depth' => $depth,
'count' => $numChildren, // Count of DB children
'count' => $count, // Count of DB children
'limited' => $limited, // Flag whether 'items' has been limited
'children' => [], // Children to return in this request
];