From 3f65f4a93344118f0c8123042d747998f52e23b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Tue, 13 Sep 2005 17:01:22 +0000 Subject: [PATCH] * Formatting --- includes/Image.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/includes/Image.php b/includes/Image.php index 4bf542e00f..66440840f4 100644 --- a/includes/Image.php +++ b/includes/Image.php @@ -1438,20 +1438,21 @@ class Image * * @return array */ - function retrieveExifData () { - if ( $this->getMimeType() !== "image/jpeg" ) return array (); + function retrieveExifData() { + if ( $this->getMimeType() !== "image/jpeg" ) + return array(); $exif = new Exif( $this->imagePath ); return $exif->getFilteredData(); } - function getExifData () { + function getExifData() { global $wgRequest; if ( $this->metadata === '0' ) return array(); $purge = $wgRequest->getVal( 'action' ) == 'purge'; - $ret = unserialize ( $this->metadata ); + $ret = unserialize( $this->metadata ); $oldver = isset( $ret['MEDIAWIKI_EXIF_VERSION'] ) ? $ret['MEDIAWIKI_EXIF_VERSION'] : 0; $newver = Exif::version(); @@ -1463,6 +1464,7 @@ class Image if ( isset( $ret['MEDIAWIKI_EXIF_VERSION'] ) ) unset( $ret['MEDIAWIKI_EXIF_VERSION'] ); $format = new FormatExif( $ret ); + return $format->getFormattedData(); } -- 2.20.1