jenkins-bot has submitted this change and it was merged.
Change subject: Remove Exif::makeFormattedData and Exif::getFormattedData
..
Remove Exif::makeFormattedData and Exif::getFormattedData
Both unused in core and Gerrit extensions.
Deprecated since MediaWiki 1.18.
Change-Id: I59e9bb5a368ffcbae1634395c0062fea0e754972
---
M RELEASE-NOTES-1.23
M includes/media/Exif.php
2 files changed, 2 insertions(+), 32 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index b933a31..a7ae161 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -101,6 +101,8 @@
- 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
--- a/includes/media/Exif.php
+++ b/includes/media/Exif.php
@@ -81,9 +81,6 @@
*/
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 @@
}
}
- /**
-* 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 );
- }
-
/**#@-*/
/**#@+
@@ -583,23 +568,6 @@
*/
function getFilteredData() {
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;
}
/**#@-*/
--
To view, visit https://gerrit.wikimedia.org/r/104042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I59e9bb5a368ffcbae1634395c0062fea0e754972
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
