X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FExifBitmap.php;h=98c423fd57164134b8b5cf696dd504a4068daf0a;hb=cf0872c783946242698bfaf9bd134d503fc393fc;hp=1a761f3a704ffeb736833b44484f115fef5ffc2e;hpb=5a63f7084342e1716267f14e448f8513ff0614fd;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/media/ExifBitmap.php b/includes/media/ExifBitmap.php index 1a761f3a70..98c423fd57 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] . ')'; @@ -190,7 +190,7 @@ class ExifBitmapHandler extends BitmapHandler { } $data = $file->getMetadata(); - return self::getRotationForExif( $data ); + return $this->getRotationForExif( $data ); } /**