summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla.pm2
-rw-r--r--Bugzilla/Error.pm21
-rw-r--r--Bugzilla/Sentry.pm1
-rw-r--r--Bugzilla/Template.pm3
-rw-r--r--template/en/default/index.html.tmpl1
5 files changed, 22 insertions, 6 deletions
diff --git a/Bugzilla.pm b/Bugzilla.pm
index 021783a75..0f513aed6 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -92,8 +92,6 @@ use constant SHUTDOWNHTML_RETRY_AFTER => 3600;
# Global Code
#####################################################################
-#$::SIG{__DIE__} = i_am_cgi() ? \&CGI::Carp::confess : \&Carp::confess;
-
# Note that this is a raw subroutine, not a method, so $class isn't available.
sub init_page {
if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm
index fa898fba4..e619f3f84 100644
--- a/Bugzilla/Error.pm
+++ b/Bugzilla/Error.pm
@@ -36,6 +36,7 @@ use Bugzilla::Util;
use Carp;
use Data::Dumper;
use Date::Format;
+use Scalar::Util qw(blessed);
# We cannot use $^S to detect if we are in an eval(), because mod_perl
# already eval'uates everything, so $^S = 1 in all cases under mod_perl!
@@ -98,7 +99,7 @@ sub _throw_error {
# There are some tests that throw and catch a lot of errors,
# and calling $template->process over and over for those errors
# is too slow. So instead, we just "die" with a dump of the arguments.
- if (Bugzilla->error_mode != ERROR_MODE_TEST) {
+ if (Bugzilla->error_mode != ERROR_MODE_TEST && !$Bugzilla::Template::is_processing) {
$template->process($name, $vars, \$message)
|| ThrowTemplateError($template->error());
}
@@ -109,6 +110,12 @@ sub _throw_error {
Bugzilla::Hook::process('error_catch', { error => $error, vars => $vars,
message => \$message });
+ if ($Bugzilla::Template::is_processing) {
+ $name =~ /^global\/(user|code)-error/;
+ my $type = $1 // 'unknown';
+ die Template::Exception->new("bugzilla.$type.$error", $vars);
+ }
+
if (Bugzilla->error_mode == ERROR_MODE_WEBPAGE) {
if (sentry_should_notify($vars->{error})) {
$vars->{maintainers_notified} = 1;
@@ -174,9 +181,9 @@ sub _throw_error {
$server->response($server->error_response_header);
}
}
+
exit;
}
-
sub ThrowUserError {
_throw_error("global/user-error.html.tmpl", @_);
}
@@ -190,7 +197,7 @@ sub ThrowCodeError {
# Don't show the error as coming from Bugzilla::Error, show it
# as coming from the caller.
local $Carp::CarpInternal{'Bugzilla::Error'} = 1;
- $vars->{traceback} = Carp::longmess();
+ $vars->{traceback} //= Carp::longmess();
_throw_error("global/code-error.html.tmpl", @_);
}
@@ -202,6 +209,14 @@ sub ThrowTemplateError {
# Make sure the transaction is rolled back (if supported).
$dbh->bz_rollback_transaction() if $dbh->bz_in_transaction();
+ if (blessed($template_err) && $template_err->isa('Template::Exception')) {
+ my $type = $template_err->type;
+ if ($type =~ /^bugzilla\.(code|user)\.(.+)/) {
+ _throw_error("global/$1-error.html.tmpl", $2, $template_err->info);
+ return;
+ }
+ }
+
my $vars = {};
if (Bugzilla->error_mode == ERROR_MODE_DIE) {
die("error: template error: $template_err");
diff --git a/Bugzilla/Sentry.pm b/Bugzilla/Sentry.pm
index d49eb0808..e2fdcad99 100644
--- a/Bugzilla/Sentry.pm
+++ b/Bugzilla/Sentry.pm
@@ -321,6 +321,7 @@ sub _sentry_die_handler {
$in_cgi_carp_die = 1 if $sub =~ /CGI::Carp::die$/;
}
+ return if $Bugzilla::Template::is_processing;
return if _in_eval();
# mod_perl overrides exit to call die with this string
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 56ebd9c21..343753d46 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -665,12 +665,15 @@ $Template::Stash::SCALAR_OPS->{ truncate } =
###############################################################################
+our $is_processing = 0;
+
sub process {
my $self = shift;
# All of this current_langs stuff allows template_inner to correctly
# determine what-language Template object it should instantiate.
my $current_langs = Bugzilla->request_cache->{template_current_lang} ||= [];
unshift(@$current_langs, $self->context->{bz_language});
+ local $is_processing = 1;
my $retval = $self->SUPER::process(@_);
shift @$current_langs;
return $retval;
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index e046553c7..f99287d49 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -32,7 +32,6 @@
style_urls = [ 'skins/standard/index.css' ]
%]
-
<script type="text/javascript">
function checkQuicksearch( form ) {
if (form.quicksearch.value == '') {