Throw an exception instead of low-level PHP fatal error if something invokes the...

diff --git a/includes/Exif.php b/includes/Exif.php
index 630821c..a009199 100644 (file)
--- a/includes/Exif.php
+++ b/includes/Exif.php
@@ -295,9 +295,13 @@ class Exif {
                $this->makeFlatExifTags();
 
                $this->debugFile( $this->basename, __FUNCTION__, true );
-               wfSuppressWarnings();
-               $data = exif_read_data( $this->file );
-               wfRestoreWarnings();
+               if( function_exists( 'exif_read_data' ) ) {
+                       wfSuppressWarnings();
+                       $data = exif_read_data( $this->file );
+                       wfRestoreWarnings();
+               } else {
+                       throw new MWException( "Internal error: exif_read_data not present. \$wgShowEXIF may be incorrectly set or not checked by an extension." );
+               }
                /**
                 * exif_read_data() will return false on invalid input, such as
                 * when somebody uploads a file called something.jpeg