Merge "Change .tocnumber to use grey text for section numbers in Table of Contents...

[lhc/web/wiklou.git] / includes / media / ExifBitmap.php

diff --git a/includes/media/ExifBitmap.php b/includes/media/ExifBitmap.php
index 3537cc6..7aeefa0 100644 (file)
--- a/includes/media/ExifBitmap.php
+++ b/includes/media/ExifBitmap.php
@@ -34,8 +34,7 @@ class ExifBitmapHandler extends BitmapHandler {
 
        function convertMetadataVersion( $metadata, $version = 1 ) {
                // basically flattens arrays.
-               $version = explode( ';', $version, 2 );
-               $version = intval( $version[0] );
+               $version = intval( explode( ';', $version, 2 )[0] );
                if ( $version < 1 || $version >= 2 ) {
                        return $metadata;
                }
@@ -146,12 +145,12 @@ class ExifBitmapHandler extends BitmapHandler {
                ) {
                        // So we don't try and display metadata from PagedTiffHandler
                        // for example when using InstantCommons.
-                       return array();
+                       return [];
                }
 
                $exif = unserialize( $metadata );
                if ( !$exif ) {
-                       return array();
+                       return [];
                }
                unset( $exif['MEDIAWIKI_EXIF_VERSION'] );
 
@@ -166,7 +165,7 @@ class ExifBitmapHandler extends BitmapHandler {
         * Wrapper for base classes ImageHandler::getImageSize() that checks for
         * rotation reported from metadata and swaps the sizes to match.
         *
-        * @param File $image
+        * @param File|FSFile $image
         * @param string $path
         * @return array
         */