| Index: trunk/phase3/includes/Sanitizer.php |
| — | — | @@ -457,10 +457,14 @@ |
| 458 | 458 | # and see if we find a match below them |
| 459 | 459 | $optstack = array(); |
| 460 | 460 | array_push( $optstack, $ot ); |
| 461 | | - $ot = @array_pop( $tagstack ); |
| | 461 | + wfSuppressWarnings(); |
| | 462 | + $ot = array_pop( $tagstack ); |
| | 463 | + wfRestoreWarnings(); |
| 462 | 464 | while ( $ot != $t && isset( $htmlsingleallowed[$ot] ) ) { |
| 463 | 465 | array_push( $optstack, $ot ); |
| 464 | | - $ot = @array_pop( $tagstack ); |
| | 466 | + wfSuppressWarnings(); |
| | 467 | + $ot = array_pop( $tagstack ); |
| | 468 | + wfRestoreWarnings(); |
| 465 | 469 | } |
| 466 | 470 | if ( $t != $ot ) { |
| 467 | 471 | # No match. Push the optional elements back again |
| Index: trunk/phase3/includes/media/Bitmap.php |
| — | — | @@ -279,7 +279,7 @@ |
| 280 | 280 | < $wgSharpenReductionThreshold ) { |
| 281 | 281 | $sharpen = "-sharpen " . wfEscapeShellArg( $wgSharpenParameter ); |
| 282 | 282 | } |
| 283 | | - if ( version_compare( $this->getMagickVersion(), "6.3.5" ) >= 0 ) { |
| | 283 | + if ( version_compare( $this->getMagickVersion(), "6.5.6" ) >= 0 ) { |
| 284 | 284 | // JPEG decoder hint to reduce memory, available since IM 6.5.6-2 |
| 285 | 285 | $decoderHint = "-define jpeg:size={$params['physicalDimensions']}"; |
| 286 | 286 | } |