From 480d5068d1d4c0fbc10d9ed16ae2ef733bfb1e33 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 12 Apr 2010 09:22:43 +0000
Subject: [PATCH] API CHANGE: Added numChildrenMethod argument to
 LeftAndMain::getSiteTreeFor() BUGFIX: Use the correct numChildrenMethod when
 showing the 'all children, including deleted' tree (from r91166) (from
 r96809)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102474 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php    |  4 ++--
 code/LeftAndMain.php   | 15 ++++++++-------
 code/SecurityAdmin.php |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 40b6a11c..875e5ccf 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -253,9 +253,9 @@ HTML;
 		return $this->getSiteTreeFor($this->stat('tree_class'), null, 'ChildFolders');
 	}
 	
-	function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $filterFunction = null, $minNodeCount = 30) {
+	function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $numChildrenMethod = null, $filterFunction = null, $minNodeCount = 30) {
 		if (!$childrenMethod) $childrenMethod = 'ChildFolders';
-		return parent::getSiteTreeFor($className, $rootID, $childrenMethod, $filterFunction, $minNodeCount);
+		return parent::getSiteTreeFor($className, $rootID, $childrenMethod, $numChildrenMethod, $filterFunction, $minNodeCount);
 	}
 	
 	public function getCMSTreeTitle() {
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 5611d12e..3b30621c 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -475,9 +475,10 @@ class LeftAndMain extends Controller {
 	 *  Children, AllChildrenIncludingDeleted, or AllHistoricalChildren
 	 * @return String Nested <ul> list with links to each page
 	 */
-	function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $filterFunction = null, $minNodeCount = 30) {
-		// Default childrenMethod
+	function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $numChildrenMethod = null, $filterFunction = null, $minNodeCount = 30) {
+		// Default childrenMethod and numChildrenMethod
 		if (!$childrenMethod) $childrenMethod = 'AllChildrenIncludingDeleted';
+		if (!$numChildrenMethod) $numChildrenMethod = 'numChildren';
 		
 		// Get the tree root
 		$obj = $rootID ? $this->getRecord($rootID) : singleton($className);
@@ -485,7 +486,7 @@ class LeftAndMain extends Controller {
 		// Mark the nodes of the tree to return
 		if ($filterFunction) $obj->setMarkingFilterFunction($filterFunction);
 
-		$obj->markPartialTree($minNodeCount, $this, $childrenMethod);
+		$obj->markPartialTree($minNodeCount, $this, $childrenMethod, $numChildrenMethod);
 		
 		// Ensure current page is exposed
 		if($p = $this->currentPage()) $obj->markToExpose($p);
@@ -509,6 +510,7 @@ class LeftAndMain extends Controller {
 			$this, 
 			true, 
 			$childrenMethod,
+			$numChildrenMethod,
 			$minNodeCount
 		);
 
@@ -542,14 +544,13 @@ class LeftAndMain extends Controller {
 			$filter = null;
 		}
 		
-		
 		$html = $this->getSiteTreeFor(
 			$this->stat('tree_class'), 
 			$request->getVar('ID'), 
-			null, 
+			($filter) ? $filter->getChildrenMethod() : null, 
+			null,
 			($filter) ? array($filter, 'isPageIncluded') : null, 
-			$request->getVar('minNodeCount'),
-			($filter) ? $filter->getChildrenMethod() : null
+			$request->getVar('minNodeCount')
 		);
 
 		// Trim off the outer tag
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 3ef4ad85..c1895bed 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -330,9 +330,9 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		return FormResponse::respond();
 	}
 	
-	function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $filterFunction = null, $minNodeCount = 30) {
+	function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $numChildrenMethod = null, $filterFunction = null, $minNodeCount = 30) {
 		if (!$childrenMethod) $childrenMethod = 'stageChildren';
-		return parent::getSiteTreeFor($className, $rootID, $childrenMethod, $filterFunction, $minNodeCount);
+		return parent::getSiteTreeFor($className, $rootID, $childrenMethod, $numChildrenMethod, $filterFunction, $minNodeCount);
 	}
 	
 	function getCMSTreeTitle() {