From d74d76b0730621b09571775902899d7030ca3150 Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Mon, 5 Apr 2010 16:26:09 -0700
Subject: Bug 556429: Stop sending bugmail from inside the template r=LpSolit,
 a=LpSolit

---
 process_bug.cgi | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'process_bug.cgi')

diff --git a/process_bug.cgi b/process_bug.cgi
index 39526b3ff..6afb9cc91 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -78,10 +78,9 @@ my $vars = {};
 sub send_results {
     my ($bug_id, $vars) = @_;
     my $template = Bugzilla->template;
-    if (Bugzilla->usage_mode == USAGE_MODE_EMAIL) {
-         Bugzilla::BugMail::Send($bug_id, $vars->{'mailrecipients'});
-    }
-    else {
+    $vars->{'sent_bugmail'} = 
+        Bugzilla::BugMail::Send($bug_id, $vars->{'mailrecipients'});
+    if (Bugzilla->usage_mode != USAGE_MODE_EMAIL) {
         $template->process("bug/process/results.html.tmpl", $vars)
             || ThrowTemplateError($template->error());
     }
-- 
cgit v1.2.3-24-g4f1b