From 7ab8441582a6b9ce1b2335762948662b38aaf217 Mon Sep 17 00:00:00 2001
From: "bugreport%peshkin.net" <>
Date: Mon, 8 Nov 2004 10:25:58 +0000
Subject: Bug 257344: Remove exit from error handlers when non-interactive
 r=glob,justdave a=justdave

---
 Bugzilla/Error.pm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'Bugzilla/Error.pm')

diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm
index 25527f599..00a2675eb 100644
--- a/Bugzilla/Error.pm
+++ b/Bugzilla/Error.pm
@@ -69,12 +69,17 @@ sub _throw_error {
         close ERRORLOGFID;
     }
 
-    print Bugzilla->cgi->header();
-
     my $template = Bugzilla->template;
-    $template->process($name, $vars)
-      || ThrowTemplateError($template->error());
-
+    if (Bugzilla->batch) {
+        my $message;
+        $template->process($name, $vars, \$message)
+          || ThrowTemplateError($template->error());
+        die("$message");
+    } else {
+        print Bugzilla->cgi->header();
+        $template->process($name, $vars)
+          || ThrowTemplateError($template->error());
+    }
     exit;
 }
 
@@ -90,6 +95,9 @@ sub ThrowTemplateError {
     my ($template_err) = @_;
 
     my $vars = {};
+    if (Bugzilla->batch) {
+        die("error: template error: $template_err");
+    }
 
     $vars->{'template_error_msg'} = $template_err;
     $vars->{'error'} = "template_error";
-- 
cgit v1.2.3-24-g4f1b