From 5fd91c426de04adff7b3d889245e2ff7e415cb31 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Thu, 16 Jul 2009 02:23:51 +0000
Subject: [PATCH] MINOR: merged r81467 from trunk

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@81971 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/model/Hierarchy.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/model/Hierarchy.php b/core/model/Hierarchy.php
index 4d8217885..35b59cb05 100644
--- a/core/model/Hierarchy.php
+++ b/core/model/Hierarchy.php
@@ -158,7 +158,11 @@ class Hierarchy extends DataObjectDecorator {
 		if($children) {
 			foreach($children as $child) {
 				if(!$this->markingFilter || $this->markingFilterMatches($child)) {
-					$child->markUnexpanded();
+					if($child->numChildren()) {
+						$child->markUnexpanded();
+					} else {
+						$child->markExpanded();
+					}
 					$this->markedNodes[$child->ID] = $child;
 				}
 			}