diff options
Diffstat (limited to 'Bugzilla')
-rw-r--r-- | Bugzilla/Config.pm | 2 | ||||
-rw-r--r-- | Bugzilla/Util.pm | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm index fe58e0282..b1b0d6667 100644 --- a/Bugzilla/Config.pm +++ b/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/Bugzilla/Util.pm b/Bugzilla/Util.pm index c6560dd11..87caa0527 100644 --- a/Bugzilla/Util.pm +++ b/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); |