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

Revert "BUGFIX Aborting marking in Hierarchy->markPartialTree() before loading nodes, if the expected node count would exceed the totals (regardless of the in-memory marking state)"

Browse Source 
This reverts commit f1bf0d0fc4. Fixes #7481
This commit is contained in:
Ingo Schommer 2012-06-15 11:53:33 +02:00
parent 8b834877f9
commit 88582e7483
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
model/Hierarchy.php
View File

@ -127,10 +127,6 @@ class Hierarchy extends DataExtension {
// foreach can't handle an ever-growing $nodes list // foreach can't handle an ever-growing $nodes list
while(list($id, $node) = each($this->markedNodes)) { while(list($id, $node) = each($this->markedNodes)) {
// Inspect the number of potential nodes to mark - if its more than the minimum count,
// don't query them in the first place to inspect further marking state in-memory
if((sizeof($this->markedNodes) + $node->$numChildrenMethod()) >= $minNodeCount) break;
$this->markChildren($node, $context, $childrenMethod, $numChildrenMethod); $this->markChildren($node, $context, $childrenMethod, $numChildrenMethod);
if($minNodeCount && sizeof($this->markedNodes) >= $minNodeCount) { if($minNodeCount && sizeof($this->markedNodes) >= $minNodeCount) {
break; break;