Bug 193286: Field validation errors had the wrong page title

r= gerv, a= justdave

diff --git a/process_bug.cgi b/process_bug.cgi
index 8567673817b7ef244514251648b6ca216e7869b6..642d5beb57a37918ff0b57b3ec1df8d0c5125488 100755 (executable)
--- a/process_bug.cgi
+++ b/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/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl
index 6305c11e40dedb19aa67c0a1cce2e9e867c98627..85a5c1fffa196edb1b19dee849b703421121d8e6 100644 (file)
--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/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/template/en/default/bug/process/results.html.tmpl b/template/en/default/bug/process/results.html.tmpl
index cc3e0df95d132a843316ef173eef0f956eefb0e1..5c3592954d13a5495acc842e077dad56e75d829b 100644 (file)
--- a/template/en/default/bug/process/results.html.tmpl
+++ b/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" %]
 
 [%