From: Florian <florian.schmidt.stargatewissen@gmail.com>
Date: Sat, 2 Jan 2016 22:01:10 +0000 (+0100)
Subject: Remove Language::armourMath() and friends
X-Git-Tag: 1.31.0-rc.0~8409^2
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=e0ad37d49a6b31656cefafb47bc415de274bf501;p=lhc%2Fweb%2Fwiklou.git

Remove Language::armourMath() and friends

Change-Id: I0ce18bce2d9b5787221e2dabff143de9792abb3a
---

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 9b12b72d17..87cb2f504e 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -103,6 +103,7 @@ production.
   if it is available.
 
 === External library changes in 1.27 ===
+
 ==== Upgraded external libraries ====
 * Updated oojs/oojs-ui from v0.12.12 to v0.13.3.
 * Updated composer/semver from v1.0.0 to v1.2.0.
@@ -227,6 +228,9 @@ changes to languages because of Phabricator reports.
 * wfMsgHtml() was removed (deprecated since 1.18).
 * wfMsgWikiHtml() was removed (deprecated since 1.18).
 * wfMsgExt() was removed (deprecated since 1.18).
+* Language::armourMath() was removed (deprecated since 1.22).
+* LanguageConverter::armourMath() was removed (deprecated since 1.22).
+* FakeConverter::armourMath() was removed (deprecated since 1.22).
 
 == Compatibility ==
 
diff --git a/languages/FakeConverter.php b/languages/FakeConverter.php
index 47d24dc488..1b6e9d6608 100644
--- a/languages/FakeConverter.php
+++ b/languages/FakeConverter.php
@@ -107,11 +107,6 @@ class FakeConverter {
 		return $key;
 	}
 
-	/** @deprecated since 1.22 is no longer used */
-	function armourMath( $text ) {
-		return $text;
-	}
-
 	function validateVariant( $variant = null ) {
 		return $variant === $this->mLang->getCode() ? $variant : null;
 	}
diff --git a/languages/Language.php b/languages/Language.php
index 69f518b33e..cb2d24f1f0 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -4157,17 +4157,6 @@ class Language {
 		return (bool)$this->mConverter->validateVariant( $variant );
 	}
 
-	/**
-	 * Put custom tags (e.g. -{ }-) around math to prevent conversion
-	 *
-	 * @param string $text
-	 * @return string
-	 * @deprecated since 1.22 is no longer used
-	 */
-	public function armourMath( $text ) {
-		return $this->mConverter->armourMath( $text );
-	}
-
 	/**
 	 * Perform output conversion on a string, and encode for safe HTML output.
 	 * @param string $text Text to be converted
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 78b3572ce8..b00aa3419d 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -1084,22 +1084,6 @@ class LanguageConverter {
 		return true;
 	}
 
-	/**
-	 * Armour rendered math against conversion.
-	 * Escape special chars in parsed math text. (in most cases are img elements)
-	 *
-	 * @param string $text Text to armour against conversion
-	 * @return string Armoured text where { and } have been converted to
-	 *   &#123; and &#125;
-	 * @deprecated since 1.22 is no longer used
-	 */
-	public function armourMath( $text ) {
-		// convert '-{' and '}-' to '-&#123;' and '&#125;-' to prevent
-		// any unwanted markup appearing in the math image tag.
-		$text = strtr( $text, array( '-{' => '-&#123;', '}-' => '&#125;-' ) );
-		return $text;
-	}
-
 	/**
 	 * Get the cached separator pattern for ConverterRule::parseRules()
 	 * @return string