diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index aa8e95d4..4ebae292 100755 --- a/code/AssetAdmin.php +++ b/code/AssetAdmin.php @@ -421,37 +421,33 @@ JS; } /** - * Return the entire site tree as a nested set of ULs + * Return the entire site tree as a nested UL. + * @return string HTML for site tree */ public function SiteTreeAsUL() { $obj = singleton('Folder'); - $obj->setMarkingFilter("ClassName", "Folder"); + $obj->setMarkingFilter('ClassName', 'Folder'); $obj->markPartialTree(); if($p = $this->currentPage()) $obj->markToExpose($p); // getChildrenAsUL is a flexible and complex way of traversing the tree + $siteTreeList = $obj->getChildrenAsUL( + '', + '"
  • ID\" class=\"$child->class" . $child->markingClasses() . ($extraArg->isCurrentPage($child) ? " current" : "") . "\">" . ' . + '"Link(),0,-1), "show", $child->ID) . "\" class=\"" . ($child->hasChildren() ? " contents" : "") . "\" >" . $child->TreeTitle() . "" ', + $this, + true + ); - $siteTree = $obj->getChildrenAsUL("", - - ' "
  • ID\" class=\"$child->class" . $child->markingClasses() . ($extraArg->isCurrentPage($child) ? " current" : "") . "\">" . ' . - - ' "Link(),0,-1), "show", $child->ID) . "\" class=\"" . ($child->hasChildren() ? " contents" : "") . "\" >" . $child->TreeTitle() . "" ', - - $this, true); - - - // Wrap the root if needs be. - + // Wrap the root if needs be $rootLink = $this->Link() . 'show/root'; - - if(!isset($rootID)) $siteTree = ""; - + if(!isset($rootID)) { + $siteTree = ""; + } return $siteTree; - } /**