diff options
-rwxr-xr-x | Bugzilla/Bug.pm | 2 | ||||
-rw-r--r-- | Bugzilla/CGI.pm | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index ba69932e9..60e9cb1f8 100755 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -30,8 +30,6 @@ package Bugzilla::Bug; use strict; -use CGI::Carp qw(fatalsToBrowser); - use Bugzilla::Attachment; use Bugzilla::Constants; use Bugzilla::Field; diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm index dd6061346..51c263472 100644 --- 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; @@ -62,6 +61,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} = []; |