diff options
author | Dylan William Hardison <dylan@hardison.net> | 2016-11-15 15:28:58 +0100 |
---|---|---|
committer | Dylan William Hardison <dylan@hardison.net> | 2016-11-15 15:28:58 +0100 |
commit | 9b24c23b18f6fe5632b174896b36fac84057f5f7 (patch) | |
tree | 9a26386c90384b75d6b8eebab1f209ffb7759d35 /Bugzilla/Error.pm | |
parent | 874e96c2423c772564c9dc63254baa99e86f270b (diff) | |
download | bugzilla-9b24c23b18f6fe5632b174896b36fac84057f5f7.tar.gz bugzilla-9b24c23b18f6fe5632b174896b36fac84057f5f7.tar.xz |
Revert "Bug 1314201 - ThrowUserError and ThrowCodeError should print headers if headers have not already been printed"
This reverts commit 874e96c2423c772564c9dc63254baa99e86f270b.
Diffstat (limited to 'Bugzilla/Error.pm')
-rw-r--r-- | Bugzilla/Error.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm index 226078f9c..fc0e4812e 100644 --- a/Bugzilla/Error.pm +++ b/Bugzilla/Error.pm @@ -112,7 +112,7 @@ sub _throw_error { } my $cgi = Bugzilla->cgi; - $cgi->close_standby_message('text/html', 'inline', 'error', 'html') unless $cgi->sent_headers; + $cgi->close_standby_message('text/html', 'inline', 'error', 'html'); $template->process($name, $vars) || ThrowTemplateError($template->error()); print $cgi->multipart_final() if $cgi->{_multipart_in_progress}; @@ -279,7 +279,7 @@ sub ThrowErrorPage { my $template = Bugzilla->template; my $vars = {}; $vars->{message} = $message; - print $cgi->header() unless $cgi->sent_headers(); + print $cgi->header(); $template->process($template_name, $vars) || ThrowTemplateError($template->error()); exit; |