Bug 300978: bad output when a non-cgi script dies

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=myk

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 3d64623679dc8d59abc36d2701c706d40cef45f1..14024c2d9d272de730cfa1418ee22cd1e8b5ead3 100755 (executable)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -35,8 +35,6 @@ use vars qw($legal_keywords @legal_platform
             @settable_resolution %components %versions %target_milestone
             @enterable_products %milestoneurl %prodmaxvotes);
 
-use CGI::Carp qw(fatalsToBrowser);
-
 use Bugzilla::Attachment;
 use Bugzilla::BugMail;
 use Bugzilla::Config;

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index e267fd91414786dd7366eed1c818de6a548744b1..b84f18da62812f97dabfb0f44775f2f20015519e 100644 (file)
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -36,7 +36,6 @@ BEGIN {
 use CGI qw(-no_xhtml -oldstyle_urls :private_tempfiles :unique_headers SERVER_PUSH);
 
 use base qw(CGI);
-use CGI::Carp qw(fatalsToBrowser);
 
 use Bugzilla::Error;
 use Bugzilla::Util;
@@ -57,6 +56,11 @@ sub new {
 
     my $self = $class->SUPER::new(@args);
 
+    # This happens here so that command-line scripts don't spit out
+    # their errors in HTML format.
+    require CGI::Carp;
+    import CGI::Carp qw(fatalsToBrowser);
+
     # Make sure our outgoing cookie list is empty on each invocation
     $self->{Bugzilla_cookie_list} = [];