diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config.pm b/mozilla/webtools/bugzilla/Bugzilla/Config.pm index fe58e02822b..b1b0d66675d 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Config.pm +++ b/mozilla/webtools/bugzilla/Bugzilla/Config.pm @@ -264,8 +264,6 @@ sub write_params { my $datadir = bz_locations()->{'datadir'}; my $param_file = "$datadir/params"; - # This only has an affect for Data::Dumper >= 2.12 (ie perl >= 5.8.0) - # Its just cosmetic, though, so that doesn't matter local $Data::Dumper::Sortkeys = 1; my ($fh, $tmpname) = File::Temp::tempfile('params.XXXXX', diff --git a/mozilla/webtools/bugzilla/Bugzilla/Util.pm b/mozilla/webtools/bugzilla/Bugzilla/Util.pm index c6560dd1169..87caa0527c4 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Util.pm +++ b/mozilla/webtools/bugzilla/Bugzilla/Util.pm @@ -106,8 +106,8 @@ sub html_light_quote { require HTML::Parser; }; - # We need utf8_mode() from HTML::Parser 3.40 if running Perl >= 5.8. - if ($@ || ($] >= 5.008 && $HTML::Parser::VERSION < 3.40)) { # Package(s) not installed. + # We need utf8_mode() from HTML::Parser 3.40. + if ($@ || $HTML::Parser::VERSION < 3.40) { # Package(s) not installed. my $safe = join('|', @allow); my $chr = chr(1); @@ -171,10 +171,10 @@ sub html_light_quote { comment => 0, process => 0); - # Avoid filling the web server error log with Perl 5.8.x. + # Avoid filling the web server error log. # In HTML::Scrubber 0.08, the HTML::Parser object is stored in # the "_p" key, but this may change in future versions. - if ($] >= 5.008 && ref($scrubber->{_p}) eq 'HTML::Parser') { + if (ref($scrubber->{_p}) eq 'HTML::Parser') { $scrubber->{_p}->utf8_mode(1); } return $scrubber->scrub($text); diff --git a/mozilla/webtools/bugzilla/checksetup.pl b/mozilla/webtools/bugzilla/checksetup.pl index 6d2037b9e1f..81d4a819f24 100755 --- a/mozilla/webtools/bugzilla/checksetup.pl +++ b/mozilla/webtools/bugzilla/checksetup.pl @@ -43,7 +43,7 @@ ###################################################################### use strict; -use 5.008; +use 5.008001; use File::Basename; use Getopt::Long qw(:config bundling); use Pod::Usage; @@ -56,8 +56,6 @@ use Bugzilla::Constants; use Bugzilla::Install::Requirements; use Bugzilla::Install::Util qw(install_string get_version_and_os); -require 5.008001 if ON_WINDOWS; # for CGI 2.93 or higher - ###################################################################### # Live Code ###################################################################### diff --git a/mozilla/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml b/mozilla/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml index 0d503eb060b..1e8b308bc9f 100644 --- a/mozilla/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml +++ b/mozilla/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml @@ -45,8 +45,7 @@ Bugzilla Documentation"> - - + ]> diff --git a/mozilla/webtools/bugzilla/docs/xml/installation.xml b/mozilla/webtools/bugzilla/docs/xml/installation.xml index c23bc250c37..5faae8bd11a 100644 --- a/mozilla/webtools/bugzilla/docs/xml/installation.xml +++ b/mozilla/webtools/bugzilla/docs/xml/installation.xml @@ -1,5 +1,5 @@ - + Installing Bugzilla @@ -54,8 +54,7 @@ Install Perl - (&min-perl-ver; or above for non-Windows platforms; &min-perl-ver-win; - for Windows) + (&min-perl-ver; or above) diff --git a/mozilla/webtools/bugzilla/t/001compile.t b/mozilla/webtools/bugzilla/t/001compile.t index 7d0bc0181db..fdbe875e374 100644 --- a/mozilla/webtools/bugzilla/t/001compile.t +++ b/mozilla/webtools/bugzilla/t/001compile.t @@ -36,11 +36,11 @@ use Test::More tests => scalar(@Support::Files::testitems); use DBI; my @DBI_drivers = DBI->available_drivers; -# Bugzilla requires Perl 5.8.0 now. Checksetup will tell you this if you run it, but +# Bugzilla requires Perl 5.8.1 now. Checksetup will tell you this if you run it, but # it tests it in a polite/passive way that won't make it fail at compile time. We'll -# slip in a compile-time failure if it's missing here so a tinderbox on < 5.8 won't -# pass and mistakenly let people think Bugzilla works on any perl below 5.8. -require 5.008; +# slip in a compile-time failure if it's missing here so a tinderbox on < 5.8.1 won't +# pass and mistakenly let people think Bugzilla works on any perl below 5.8.1. +require 5.008001; # Capture the TESTOUT from Test::More or Test::Builder for printing errors. # This will handle verbosity for us automatically.