Fix processTemplate for new instanciators and exception handling.
This commit is contained in:
parent
059cb4277a
commit
63f829ee96
1 changed files with 2 additions and 2 deletions
|
|
@ -2141,8 +2141,8 @@ sub processTemplate {
|
||||||
$self->session->errorHandler->error("First argument to processTemplate() should be a hash reference.");
|
$self->session->errorHandler->error("First argument to processTemplate() should be a hash reference.");
|
||||||
return "Error: Can't process template for asset ".$self->getId." of type ".$self->get("className");
|
return "Error: Can't process template for asset ".$self->getId." of type ".$self->get("className");
|
||||||
}
|
}
|
||||||
$template = WebGUI::Asset->new($self->session, $templateId,"WebGUI::Asset::Template") unless (defined $template);
|
$template = eval { WebGUI::Asset->newById($self->session, $templateId) unless (defined $template); };
|
||||||
if (defined $template) {
|
if (! Exception::Class->caught() ) {
|
||||||
$var = { %{ $var }, %{ $self->getMetaDataAsTemplateVariables } };
|
$var = { %{ $var }, %{ $self->getMetaDataAsTemplateVariables } };
|
||||||
$var->{'controls'} = $self->getToolbar if $self->session->var->isAdminOn;
|
$var->{'controls'} = $self->getToolbar if $self->session->var->isAdminOn;
|
||||||
my %vars = (
|
my %vars = (
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue