Spaces to tabs

[lhc/web/wiklou.git] / includes / Exif.php

diff --git a/includes/Exif.php b/includes/Exif.php
index 971d019..a009199 100644 (file)
--- a/includes/Exif.php
+++ b/includes/Exif.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * Exif metadata reader
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -293,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
@@ -558,7 +564,7 @@ class Exif {
         * @param $fname String:
         * @param $action Mixed: , default NULL.
         */
-       function debug( $in, $fname, $action = NULL ) {
+       function debug( $in, $fname, $action = null ) {
                if ( !$this->log ) {
                        return;
                }
@@ -618,7 +624,7 @@ class FormatExif {
         * @param $exif Array: the Exif data to format ( as returned by
         *                    Exif::getFilteredData() )
         */
-       function FormatExif( $exif ) {
+       function __construct( $exif ) {
                $this->mExif = $exif;
        }
 
@@ -1146,15 +1152,3 @@ class FormatExif {
                return $a;
        }
 }
-
-/**
- * MW 1.6 compatibility
- */
-define( 'MW_EXIF_BYTE', Exif::BYTE );
-define( 'MW_EXIF_ASCII', Exif::ASCII );
-define( 'MW_EXIF_SHORT', Exif::SHORT );
-define( 'MW_EXIF_LONG', Exif::LONG );
-define( 'MW_EXIF_RATIONAL', Exif::RATIONAL );
-define( 'MW_EXIF_UNDEFINED', Exif::UNDEFINED );
-define( 'MW_EXIF_SLONG', Exif::SLONG );
-define( 'MW_EXIF_SRATIONAL', Exif::SRATIONAL );