merging 6.5.6 bug fixes

This commit is contained in:
JT Smith 2005-04-05 13:32:22 +00:00
parent 8ea183be00
commit 0554039f51
8 changed files with 296 additions and 14 deletions

View file

@ -2172,7 +2172,7 @@ sub template {
$returnUrl = "&proceed=goBackToPage&returnUrl=".WebGUI::URL::escape($session{asset}->getUrl);
}
$buttons = editIcon("func=edit".$returnUrl,$template->get("url"));
$buttons .= manageIcon("",$template->getParent->get("url"));
$buttons .= manageIcon("func=manageAssets",$template->getParent->get("url"));
}
$output = WebGUI::Form::template({
"name"=>$name,