Permalink
Browse files

Revert "BUGFIX Aborting marking in Hierarchy->markPartialTree() befor…

…e loading nodes, if the expected node count would exceed the totals (regardless of the in-memory marking state)"

This reverts commit f1bf0d0. Fixes #7481
  • Loading branch information...
1 parent 8b83487 commit 88582e7483a980cc294b1ef2e7e0c96ae806b60b @chillu chillu committed Jun 15, 2012
Showing with 0 additions and 4 deletions.
  1. +0 −4 model/Hierarchy.php
View
@@ -127,10 +127,6 @@ public function markPartialTree($minNodeCount = 30, $context = null, $childrenMe
// foreach can't handle an ever-growing $nodes list
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);
if($minNodeCount && sizeof($this->markedNodes) >= $minNodeCount) {
break;

0 comments on commit 88582e7

Please sign in to comment.