From 1e2add934a85d36a87823f9aab506e6d2ef5b657 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Thu, 8 Dec 2011 18:07:26 +0000 Subject: [PATCH] Fix version check version from r105559 --- includes/Sanitizer.php | 8 ++++++-- includes/media/Bitmap.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php index 478fe1eaaa..fb386102e6 100644 --- a/includes/Sanitizer.php +++ b/includes/Sanitizer.php @@ -457,10 +457,14 @@ class Sanitizer { # and see if we find a match below them $optstack = array(); array_push( $optstack, $ot ); - $ot = @array_pop( $tagstack ); + wfSuppressWarnings(); + $ot = array_pop( $tagstack ); + wfRestoreWarnings(); while ( $ot != $t && isset( $htmlsingleallowed[$ot] ) ) { array_push( $optstack, $ot ); - $ot = @array_pop( $tagstack ); + wfSuppressWarnings(); + $ot = array_pop( $tagstack ); + wfRestoreWarnings(); } if ( $t != $ot ) { # No match. Push the optional elements back again diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php index 76c3009e9e..dd1f7f1d0a 100644 --- a/includes/media/Bitmap.php +++ b/includes/media/Bitmap.php @@ -279,7 +279,7 @@ class BitmapHandler extends ImageHandler { < $wgSharpenReductionThreshold ) { $sharpen = "-sharpen " . wfEscapeShellArg( $wgSharpenParameter ); } - if ( version_compare( $this->getMagickVersion(), "6.3.5" ) >= 0 ) { + if ( version_compare( $this->getMagickVersion(), "6.5.6" ) >= 0 ) { // JPEG decoder hint to reduce memory, available since IM 6.5.6-2 $decoderHint = "-define jpeg:size={$params['physicalDimensions']}"; } -- 2.20.1