diff --git a/lib/WebGUI/Macro/RootTitle.pm b/lib/WebGUI/Macro/RootTitle.pm index 5c34c68e0..d470afcbe 100644 --- a/lib/WebGUI/Macro/RootTitle.pm +++ b/lib/WebGUI/Macro/RootTitle.pm @@ -32,17 +32,19 @@ is returned. Otherwise an empty string is returned. #------------------------------------------------------------------- sub process { my $session = shift; - if ($session->asset) { - my $lineage = $session->asset->get("lineage"); - $lineage = substr($lineage,0,6); - my $root = WebGUI::Asset->newByLineage($session,$lineage); - if (defined $root) { - return $root->get("title"); - } - } - return ""; + return "" unless $session->asset; + + my $lineage = $session->asset->get("lineage"); + return $session->asset->getTitle + if (length($lineage) == 6); ##I am the super root. + + ##Get my root. + $lineage = substr($lineage,0,12); + my $root = WebGUI::Asset->newByLineage($session,$lineage); + + return "" unless defined $root; + return $root->get("title"); } 1; - diff --git a/lib/WebGUI/Macro/r_printable.pm b/lib/WebGUI/Macro/r_printable.pm index 4049f641d..5955eb55a 100644 --- a/lib/WebGUI/Macro/r_printable.pm +++ b/lib/WebGUI/Macro/r_printable.pm @@ -50,7 +50,7 @@ is used. #------------------------------------------------------------------- sub process { my $session = shift; - my ($temp, @param, $styleId); + my ($temp, @param); @param = @_; my $append = 'op=makePrintable'; if ($session->env->get("REQUEST_URI") =~ /op\=/) {