diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /includes/media/ImageHandler.php | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/media/ImageHandler.php')
| -rw-r--r-- | includes/media/ImageHandler.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/media/ImageHandler.php b/includes/media/ImageHandler.php index 6dd0453e..968e4243 100644 --- a/includes/media/ImageHandler.php +++ b/includes/media/ImageHandler.php @@ -57,7 +57,7 @@ abstract class ImageHandler extends MediaHandler { } elseif ( isset( $params['width'] ) ) { $width = $params['width']; } else { - throw new MWException( 'No width specified to ' . __METHOD__ ); + throw new MediaTransformInvalidParametersException( 'No width specified to ' . __METHOD__ ); } # Removed for ProofreadPage @@ -245,11 +245,11 @@ abstract class ImageHandler extends MediaHandler { if ( $pages === false || $pages <= 1 ) { $msg = wfMessage( 'file-info-size' )->numParams( $file->getWidth(), $file->getHeight() )->params( $size, - $file->getMimeType() )->parse(); + '<span class="mime-type">' . $file->getMimeType() . '</span>' )->parse(); } else { $msg = wfMessage( 'file-info-size-pages' )->numParams( $file->getWidth(), $file->getHeight() )->params( $size, - $file->getMimeType() )->numParams( $pages )->parse(); + '<span class="mime-type">' . $file->getMimeType() . '</span>' )->numParams( $pages )->parse(); } return $msg; |