From c9fc1ea46ba1546e6fc5d5191efa2515d503ac8b Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 19 Feb 2008 00:24:13 +0000
Subject: [PATCH] Merged revisions 48425 via svnmerge from
 svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2

........
  r48425 | sminnee | 2008-01-22 17:16:41 +1300 (Tue, 22 Jan 2008) | 3 lines

  Updated AssetAdmin to use TreeTitle() in place of Title for tree generation
  > Updated TreeTitle() to allow use of alternateTreeTitle() in decorator
  > Updated File to allow the insertion of extra columns by decorator
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49771 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index e2427b75..6bb7eb35 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -420,7 +420,7 @@ JS;
 
 					' "<li id=\"record-$child->ID\" class=\"$child->class" . $child->markingClasses() .  ($extraArg->isCurrentPage($child) ? " current" : "") . "\">" . ' .
 
-					' "<a href=\"" . Director::link(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" class=\"" . ($child->hasChildren() ? " contents" : "") . "\" >" . $child->Title . "</a>" ',
+					' "<a href=\"" . Director::link(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" class=\"" . ($child->hasChildren() ? " contents" : "") . "\" >" . $child->TreeTitle() . "</a>" ',
 
 					$this, true);
 					
@@ -450,7 +450,7 @@ JS;
 
 					' "<li id=\"record-$child->ID\" class=\"$child->class" . $child->markingClasses() .  ($extraArg->isCurrentPage($child) ? " current" : "") . "\">" . ' .
 
-					' "<a href=\"" . Director::link(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" >" . $child->Title . "</a>" ',
+					' "<a href=\"" . Director::link(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" >" . $child->TreeTitle() . "</a>" ',
 
 					$this, true);