X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FExif.php;h=844aef2684314e68e0e71dc473d05b063621802a;hb=f726bbf6e7f26cd268e6c44a4af675c15a337921;hp=bb5e344d9402f6816e9a086f2911e43d6334f5f6;hpb=aa5e15357aab7365815c154fd86bdaa6f968b97a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/Exif.php b/includes/media/Exif.php
index bb5e344d94..844aef2684 100644
--- a/includes/media/Exif.php
+++ b/includes/media/Exif.php
@@ -81,9 +81,6 @@ class Exif {
 	 */
 	private $mFilteredExifData;
 
-	/** @var array Filtered and formatted Exif data, see FormatMetadata::getFormattedData() */
-	private $mFormattedExifData;
-
 	/** @var string The file being processed */
 	private $file;
 
@@ -553,18 +550,6 @@ class Exif {
 		}
 	}
 
-	/**
-	 * Use FormatMetadata to create formatted values for display to user
-	 * (is this ever used?)
-	 *
-	 * @deprecated since 1.18
-	 */
-	function makeFormattedData() {
-		wfDeprecated( __METHOD__, '1.18' );
-		$this->mFormattedExifData = FormatMetadata::getFormattedData(
-			$this->mFilteredExifData );
-	}
-
 	/**#@-*/
 
 	/**#@+
@@ -585,23 +570,6 @@ class Exif {
 		return $this->mFilteredExifData;
 	}
 
-	/**
-	 * Get $this->mFormattedExifData
-	 *
-	 * This returns the data for display to user.
-	 * Its unclear if this is ever used.
-	 *
-	 * @deprecated since 1.18
-	 */
-	function getFormattedData() {
-		wfDeprecated( __METHOD__, '1.18' );
-		if ( !$this->mFormattedExifData ) {
-			$this->makeFormattedData();
-		}
-
-		return $this->mFormattedExifData;
-	}
-
 	/**#@-*/
 
 	/**