From: reed%reedloden.com <>
Date: Wed, 18 Nov 2009 18:23:32 +0000 (+0000)
Subject: Bug 360626 - "ThrowTemplateError() used in Util.pm" [p=reed r=LpSolit a=LpSolit]
X-Git-Tag: bugzilla-3.5.2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0c052e34345a0a3cc2be95b9881bf91005da69a;p=thirdparty%2Fbugzilla.git

Bug 360626 - "ThrowTemplateError() used in Util.pm" [p=reed r=LpSolit a=LpSolit]
---

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index b5e99bf691..48ac065028 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -593,8 +593,10 @@ sub get_text {
     $vars ||= {};
     $vars->{'message'} = $name;
     my $message;
-    $template->process('global/message.txt.tmpl', $vars, \$message)
-        || ThrowTemplateError($template->error());
+    if (!$template->process('global/message.txt.tmpl', $vars, \$message)) {
+        require Bugzilla::Error;
+        Bugzilla::Error::ThrowTemplateError($template->error());
+    }
     # Remove the indenting that exists in messages.html.tmpl.
     $message =~ s/^    //gm;
     return $message;