diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2013-12-08 09:55:49 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2013-12-08 09:55:49 +0100 |
| commit | 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e (patch) | |
| tree | af68743f2f4a47d13f2b0eb05f5c4aaf86d8ea37 /includes/media/ExifBitmap.php | |
| parent | af4da56f1ad4d3ef7b06557bae365da2ea27a897 (diff) | |
Update to MediaWiki 1.22.0
Diffstat (limited to 'includes/media/ExifBitmap.php')
| -rw-r--r-- | includes/media/ExifBitmap.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/media/ExifBitmap.php b/includes/media/ExifBitmap.php index 1671ab25..d8d0bede 100644 --- a/includes/media/ExifBitmap.php +++ b/includes/media/ExifBitmap.php @@ -51,11 +51,11 @@ class ExifBitmapHandler extends BitmapHandler { // Treat Software as a special case because in can contain // an array of (SoftwareName, Version). - if (isset( $metadata['Software'] ) + if ( isset( $metadata['Software'] ) && is_array( $metadata['Software'] ) - && is_array( $metadata['Software'][0]) + && is_array( $metadata['Software'][0] ) && isset( $metadata['Software'][0][0] ) - && isset( $metadata['Software'][0][1]) + && isset( $metadata['Software'][0][1] ) ) { $metadata['Software'] = $metadata['Software'][0][0] . ' (Version ' . $metadata['Software'][0][1] . ')'; @@ -84,7 +84,7 @@ class ExifBitmapHandler extends BitmapHandler { return self::METADATA_GOOD; } if ( $metadata === self::OLD_BROKEN_FILE ) { - # Old special value indicating that there is no EXIF data in the file. + # Old special value indicating that there is no Exif data in the file. # or that there was an error well extracting the metadata. wfDebug( __METHOD__ . ": back-compat version\n" ); return self::METADATA_COMPATIBLE; |