* Using wfSupressWarnings() to avoid warnings on corrupt exif headers

diff --git a/includes/Image.php b/includes/Image.php
index 2922312..69f24de 100644 (file)
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -1400,7 +1400,10 @@ class Image
        function retrieveExifData () {
                if ( $this->getMimeType() !== "image/jpeg" ) return array ();
 
+               wfSuppressWarnings();
                $exif = exif_read_data( $this->imagePath );
+               wfRestoreWarnings();
+
                foreach($exif as $k => $v) {
                        if ( !in_array($k, array_keys($this->exif->mFlatExif)) ) {
                                wfDebug( "Image::retrieveExifData: '$k' is not a valid Exif tag (type: '" . gettype($v) . "'; data: '$v')\n");