From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- includes/media/Jpeg.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'includes/media/Jpeg.php') diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php index fbdbdfe3..5463922b 100644 --- a/includes/media/Jpeg.php +++ b/includes/media/Jpeg.php @@ -106,7 +106,7 @@ class JpegHandler extends ExifBitmapHandler { $meta['MEDIAWIKI_EXIF_VERSION'] = Exif::version(); return serialize( $meta ); - } catch ( MWException $e ) { + } catch ( Exception $e ) { // BitmapMetadataHandler throws an exception in certain exceptional // cases like if file does not exist. wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" ); @@ -143,10 +143,8 @@ class JpegHandler extends ExifBitmapHandler { " -outfile " . wfEscapeShellArg( $params['dstPath'] ) . " " . wfEscapeShellArg( $params['srcPath'] ); wfDebug( __METHOD__ . ": running jpgtran: $cmd\n" ); - wfProfileIn( 'jpegtran' ); $retval = 0; $err = wfShellExecWithStderr( $cmd, $retval ); - wfProfileOut( 'jpegtran' ); if ( $retval !== 0 ) { $this->logErrorForExternalProcess( $retval, $err, $cmd ); -- cgit v1.2.3-54-g00ecf