Remove Exif::makeFormattedData and Exif::getFormattedData

Both unused in core and Gerrit extensions.
Deprecated since MediaWiki 1.18.

Change-Id: I59e9bb5a368ffcbae1634395c0062fea0e754972

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index b933a31..a7ae161 100644 (file)
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -101,6 +101,8 @@ production.
   - LoadMonitor_MySQL to LoadMonitorMySQL
   - LoadMonitor_Null to LoadMonitorNull
 * Removed methods:
+  - Exif::getFormattedData() (deprecated in 1.18)
+  - Exif::makeFormattedData() (deprecated in 1.18)
   - Linker::makeBrokenLink() (deprecated in 1.16)
   - Linker::makeBrokenLinkObj() (deprecated in 1.16)
   - Linker::makeColouredLinkObj() (deprecated in 1.16)

diff --git a/includes/media/Exif.php b/includes/media/Exif.php
index bb5e344..844aef2 100644 (file)
--- 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;
-       }
-
        /**#@-*/
 
        /**