From 695b26c770900b2b52281501f52bd45730435a56 Mon Sep 17 00:00:00 2001
From: "justdave%syndicomm.com" <justdave%syndicomm.com>
Date: Sat, 15 Feb 2003 08:03:51 +0000
Subject: [PATCH] Bug 193286: Field validation errors had the wrong page title
 r= gerv, a= justdave

---
 webtools/bugzilla/process_bug.cgi                        | 9 +++------
 .../template/en/default/bug/process/midair.html.tmpl     | 4 ++++
 .../template/en/default/bug/process/results.html.tmpl    | 4 ++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/webtools/bugzilla/process_bug.cgi b/webtools/bugzilla/process_bug.cgi
index 8567673817b..642d5beb57a 100755
--- a/webtools/bugzilla/process_bug.cgi
+++ b/webtools/bugzilla/process_bug.cgi
@@ -168,12 +168,6 @@ if ($::COOKIE{"BUGLIST"} && $::FORM{'id'}) {
     }
 }
 
-# Start displaying the response page.
-$template->process("bug/process/header.html.tmpl", $vars)
-  || ThrowTemplateError($template->error());
-
-$vars->{'header_done'} = 1;
-
 GetVersionTable();
 
 CheckFormFieldDefined(\%::FORM, 'product');
@@ -1670,6 +1664,7 @@ foreach my $id (@idlist) {
     # receive email about the change.
     $template->process("bug/process/results.html.tmpl", $vars)
       || ThrowTemplateError($template->error());
+    $vars->{'header_done'} = 1;
     
     if ($duplicate) {
         # Check to see if Reporter of this bug is reporter of Dupe 
@@ -1700,6 +1695,7 @@ foreach my $id (@idlist) {
         # Let the user know a duplication notation was added to the original bug.
         $template->process("bug/process/results.html.tmpl", $vars)
           || ThrowTemplateError($template->error());
+        $vars->{'header_done'} = 1;
     }
 
     if ($check_dep_bugs) {
@@ -1713,6 +1709,7 @@ foreach my $id (@idlist) {
             # bug and who did and didn't receive email about it.
             $template->process("bug/process/results.html.tmpl", $vars)
               || ThrowTemplateError($template->error());
+            $vars->{'header_done'} = 1;
         }
     }
 }
diff --git a/webtools/bugzilla/template/en/default/bug/process/midair.html.tmpl b/webtools/bugzilla/template/en/default/bug/process/midair.html.tmpl
index 6305c11e40d..85a5c1fffa1 100644
--- a/webtools/bugzilla/template/en/default/bug/process/midair.html.tmpl
+++ b/webtools/bugzilla/template/en/default/bug/process/midair.html.tmpl
@@ -34,6 +34,10 @@
   # bug_id: number; the ID of the bug being changed.
   #%]
  
+[% UNLESS header_done %]
+  [% PROCESS bug/process/header.html.tmpl %]
+[% END %]
+
 <h1>Mid-air collision detected!</h1>
 
 <p>
diff --git a/webtools/bugzilla/template/en/default/bug/process/results.html.tmpl b/webtools/bugzilla/template/en/default/bug/process/results.html.tmpl
index cc3e0df95d1..5c3592954d1 100644
--- a/webtools/bugzilla/template/en/default/bug/process/results.html.tmpl
+++ b/webtools/bugzilla/template/en/default/bug/process/results.html.tmpl
@@ -29,6 +29,10 @@
   # mailrecipients: hash; BugMail recipient params. Optional.
   #%]
 
+[% UNLESS header_done %]
+  [% PROCESS bug/process/header.html.tmpl %]
+[% END %]
+
 [% DEFAULT type="bug" %]
 
 [%