From 0a0b6557e2744256dc743a4f373c48a9b2ef55ac Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Wed, 3 Mar 2010 11:09:50 -0800 Subject: [PATCH] Eval and error handling for processTemplate. --- lib/WebGUI/Asset.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 55b7b92cd..c5239b7e4 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -2163,7 +2163,9 @@ sub processTemplate { $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"); } - $template = eval { WebGUI::Asset->newById($self->session, $templateId) unless (defined $template); }; + if (!defined $template) { + $template = eval { WebGUI::Asset->newById($self->session, $templateId) }; + } if (! Exception::Class->caught() ) { $var = { %{ $var }, %{ $self->getMetaDataAsTemplateVariables } }; $var->{'controls'} = $self->getToolbar if $self->session->var->isAdminOn;