don't choke if EXIF library is not available

diff --git a/includes/Image.php b/includes/Image.php
index 2b49627..6b53b5c 100644 (file)
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -188,7 +188,8 @@ class Image
         * Load metadata from the file itself
         */
        function loadFromFile() {
-               global $wgUseSharedUploads, $wgSharedUploadDirectory, $wgLang;
+               global $wgUseSharedUploads, $wgSharedUploadDirectory, $wgLang,
+                      $wgShowEXIF;
                $fname = 'Image::loadFromFile';
                wfProfileIn( $fname );
                $this->imagePath = $this->getFullPath();
@@ -267,7 +268,7 @@ class Image
                $this->dataLoaded = true;
                
                
-               if ($this->fileExists) $this->metadata = serialize ( $this->retrieveExifData() ) ;
+               if ($this->fileExists && $wgShowEXIF) $this->metadata = serialize ( $this->retrieveExifData() ) ;
                else $this->metadata = serialize ( array() ) ;
                
                if ( isset( $gis['bits'] ) )  $this->bits = $gis['bits'];