From 423c0682c582acaf8f6a6efb335dd34ec2302bcb Mon Sep 17 00:00:00 2001
From: Chad Horohoe <chadh@wikimedia.org>
Date: Thu, 2 Jan 2014 11:35:07 -0800
Subject: [PATCH] Remove deprecated convertLinkToAllVariants()

Deprecated since 1.17, not used anywhere in core or extensions

Change-Id: Id90ee1765899ea331a65ce372744ed465686c84b
---
 RELEASE-NOTES-1.23              |  2 ++
 languages/Language.php          | 16 ----------------
 languages/LanguageConverter.php | 15 ---------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index a0056724f9..dd99e4267e 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -173,6 +173,8 @@ changes to languages because of Bugzilla reports.
 * Removed methods:
   - Exif::getFormattedData() (deprecated in 1.18)
   - Exif::makeFormattedData() (deprecated in 1.18)
+  - Language::convertLinkToAllVariants() (deprecated in 1.17)
+  - LanguageConverter::convertLinkToAllVariants() (deprecated in 1.17)
   - Linker::makeBrokenLink() (deprecated in 1.16)
   - Linker::makeBrokenLinkObj() (deprecated in 1.16)
   - Linker::makeColouredLinkObj() (deprecated in 1.16)
diff --git a/languages/Language.php b/languages/Language.php
index 23506e9667..320688a319 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -62,7 +62,6 @@ class FakeConverter {
 	function getParsedTitle() { return ''; }
 	function markNoConversion( $text, $noParse = false ) { return $text; }
 	function convertCategoryKey( $key ) { return $key; }
-	function convertLinkToAllVariants( $text ) { return $this->autoConvertToAllVariants( $text ); }
 	/** @deprecated since 1.22 is no longer used */
 	function armourMath( $text ) { return $text; }
 	function validateVariant( $variant = null ) { return $variant === $this->mLang->getCode() ? $variant : null; }
@@ -3905,21 +3904,6 @@ class Language {
 		$this->mConverter->findVariantLink( $link, $nt, $ignoreOtherCond );
 	}
 
-	/**
-	 * If a language supports multiple variants, converts text
-	 * into an array of all possible variants of the text:
-	 *  'variant' => text in that variant
-	 *
-	 * @deprecated since 1.17 Use autoConvertToAllVariants()
-	 *
-	 * @param $text string
-	 *
-	 * @return string
-	 */
-	public function convertLinkToAllVariants( $text ) {
-		return $this->mConverter->convertLinkToAllVariants( $text );
-	}
-
 	/**
 	 * returns language specific options used by User::getPageRenderHash()
 	 * for example, the preferred language variant
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index cec9ddb5db..bb5b49fd62 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -491,21 +491,6 @@ class LanguageConverter {
 		return $ret;
 	}
 
-	/**
-	 * Convert link text to all valid variants.
-	 * In the first, this function only convert text outside the
-	 * "-{" "}-" markups. Since the "{" and "}" are not allowed in
-	 * titles, the text will get all converted always.
-	 * So I removed this feature and deprecated the function.
-	 *
-	 * @param $text String: the text to be converted
-	 * @return Array: variant => converted text
-	 * @deprecated since 1.17 Use autoConvertToAllVariants() instead
-	 */
-	public function convertLinkToAllVariants( $text ) {
-		return $this->autoConvertToAllVariants( $text );
-	}
-
 	/**
 	 * Apply manual conversion rules.
 	 *
-- 
2.20.1