From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Mon, 9 May 2005 19:25:57 +0000 (+0000)
Subject: * Removed checks for $wgShowEXIF, these functions never even get called from
X-Git-Tag: 1.5.0alpha2~237
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=c03a3143014e505196c2e5068486f3b06c25f7c5;p=lhc%2Fweb%2Fwiklou.git

* Removed checks for $wgShowEXIF, these functions never even get called from
  the parent if it's false so they're redundant.
---

diff --git a/includes/Image.php b/includes/Image.php
index 4c9a1c6c0a..f7660848de 100644
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -1146,8 +1146,6 @@ class Image
 	 * @return array
 	 */
 	function retrieveExifData () {
-		global $wgShowEXIF ;
-		if ( ! $wgShowEXIF ) return array ();
 		if ( $this->type !== '2' ) return array ();
 
 		$exif = exif_read_data( $this->imagePath );
@@ -1191,10 +1189,9 @@ class Image
 	}
 
 	function updateExifData( $version ) {
-		global $wgShowEXIF;
 		$fname = 'Image:updateExifData';
 		
-		if ( ! $wgShowEXIF || $this->getImagePath() === false ) # Not a local image
+		if ( $this->getImagePath() === false ) # Not a local image
 			return;
 		
 		# Get EXIF data from image