From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 3 May 2012 13:01:35 +0200 Subject: Update to MediaWiki 1.19.0 --- includes/media/ExifBitmap.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'includes/media/ExifBitmap.php') diff --git a/includes/media/ExifBitmap.php b/includes/media/ExifBitmap.php index 05ce161b..7b9867f7 100644 --- a/includes/media/ExifBitmap.php +++ b/includes/media/ExifBitmap.php @@ -34,8 +34,8 @@ class ExifBitmapHandler extends BitmapHandler { // Treat Software as a special case because in can contain // an array of (SoftwareName, Version). - if (isset( $metadata['Software'] ) - && is_array( $metadata['Software'] ) + if (isset( $metadata['Software'] ) + && is_array( $metadata['Software'] ) && is_array( $metadata['Software'][0]) && isset( $metadata['Software'][0][0] ) && isset( $metadata['Software'][0][1]) @@ -136,8 +136,8 @@ class ExifBitmapHandler extends BitmapHandler { function getImageSize( $image, $path ) { global $wgEnableAutoRotation; $gis = parent::getImageSize( $image, $path ); - - // Don't just call $image->getMetadata(); File::getPropsFromPath() calls us with a bogus object. + + // Don't just call $image->getMetadata(); FSFile::getPropsFromPath() calls us with a bogus object. // This may mean we read EXIF data twice on initial upload. if ( $wgEnableAutoRotation ) { $meta = $this->getMetadata( $image, $path ); @@ -171,7 +171,7 @@ class ExifBitmapHandler extends BitmapHandler { if ( !$wgEnableAutoRotation ) { return 0; } - + $data = $file->getMetadata(); return $this->getRotationForExif( $data ); } -- cgit v1.2.3-54-g00ecf