diff options
| author | Byron Jones <bjones@mozilla.com> | 2012-04-10 15:09:28 +0200 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2012-04-10 15:09:28 +0200 |
| commit | b8b57b2c41fd39d4c4791699759d2b68a3a2215a (patch) | |
| tree | 0a9e52a85cb315bf02a4ffcc45b12a2d5989a1ed /Bugzilla/Error.pm | |
| parent | 71f822cd35dbd13a11e5bf0563f046010f587923 (diff) | |
| download | bugzilla-b8b57b2c41fd39d4c4791699759d2b68a3a2215a.tar.gz bugzilla-b8b57b2c41fd39d4c4791699759d2b68a3a2215a.tar.xz | |
Bug 739153: fix infinite recursion in error handler
Diffstat (limited to 'Bugzilla/Error.pm')
| -rw-r--r-- | Bugzilla/Error.pm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm index c2fcfdd55..df03dfd6d 100644 --- a/Bugzilla/Error.pm +++ b/Bugzilla/Error.pm @@ -192,11 +192,16 @@ sub ThrowTemplateError { die("error: template error: $template_err"); } + # mod_perl overrides exit to call die with this string + # we never want to display this to the user + exit if $template_err =~ /\bModPerl::Util::exit\b/; + $vars->{'template_error_msg'} = $template_err; $vars->{'error'} = "template_error"; $vars->{'uid'} = arecibo_generate_id(); arecibo_handle_error('error', $template_err, $vars->{'uid'}); + $vars->{'template_error_msg'} =~ s/ at \S+ line \d+\.\s*$//; my $template = Bugzilla->template; |