summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjustdave%syndicomm.com <>2003-02-15 17:03:41 +0100
committerjustdave%syndicomm.com <>2003-02-15 17:03:41 +0100
commitbdb93447f0a8b23db0bd7dfb0275c490b651f7ac (patch)
tree5ac0980577db6315c8819805d55d7048f1f18c4d
parentcbb2ab5854d6d623476d07bcd2164e5de8257fd2 (diff)
downloadbugzilla-bdb93447f0a8b23db0bd7dfb0275c490b651f7ac.tar.gz
bugzilla-bdb93447f0a8b23db0bd7dfb0275c490b651f7ac.tar.xz
Bug 193286: Field validation errors had the wrong page title
r= gerv, a= justdave
-rwxr-xr-xprocess_bug.cgi9
-rw-r--r--template/en/default/bug/process/midair.html.tmpl4
-rw-r--r--template/en/default/bug/process/results.html.tmpl4
3 files changed, 11 insertions, 6 deletions
diff --git a/process_bug.cgi b/process_bug.cgi
index 856767381..642d5beb5 100755
--- 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 6305c11e4..85a5c1fff 100644
--- 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 cc3e0df95..5c3592954 100644
--- 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" %]
[%