From: Fomafix <fomafix@googlemail.com>
Date: Sat, 2 Mar 2019 11:14:28 +0000 (+0100)
Subject: Remove deprecated Language::markNoConversion
X-Git-Tag: 1.34.0-rc.0~2602
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=200c722d494e3214989c4a3e7e7ca1abd0b41a3f;p=lhc%2Fweb%2Fwiklou.git

Remove deprecated Language::markNoConversion

Language::markNoConversion was hard-deprecated in 7de2c566d included in
1.32.

Change-Id: I2cc200d7a814e73d9c6138860190f44232a6bd3c
---

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index cff28535b0..b9331bc8de 100644
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -282,6 +282,8 @@ because of Phabricator reports.
     AuthManagerAuthPlugin, and AuthManagerAuthPluginUser.
   * The $wgAuth configuration setting and its use in Setup.php and unit tests
 * (T217772) The 'wgAvailableSkins' mw.config key in JavaScript, was removed.
+* Language::markNoConversion, deprecated in 1.32, has been removed. Use
+  LanguageConverter::markNoConversion instead.
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected
diff --git a/languages/Language.php b/languages/Language.php
index 3dbde01b63..bbf2576f20 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -4331,32 +4331,6 @@ class Language {
 		$this->mConverter->updateConversionTable( $title );
 	}
 
-	/**
-	 * Prepare external link text for conversion. When the text is
-	 * a URL, it shouldn't be converted, and it'll be wrapped in
-	 * the "raw" tag (-{R| }-) to prevent conversion.
-	 *
-	 * This function is called "markNoConversion" for historical
-	 * reasons *BUT DIFFERS SIGNIFICANTLY* from
-	 * LanguageConverter::markNoConversion(), with which it is easily
-	 * confused.
-	 *
-	 * @param string $text Text to be used for external link
-	 * @param bool $noParse Wrap it without confirming it's a real URL first
-	 * @return string The tagged text
-	 * @deprecated since 1.32, use LanguageConverter::markNoConversion()
-	 *  instead.
-	 */
-	public function markNoConversion( $text, $noParse = false ) {
-		wfDeprecated( __METHOD__, '1.32' );
-		// Excluding protocal-relative URLs may avoid many false positives.
-		if ( $noParse || preg_match( '/^(?:' . wfUrlProtocolsWithoutProtRel() . ')/', $text ) ) {
-			return $this->mConverter->markNoConversion( $text );
-		} else {
-			return $text;
-		}
-	}
-
 	/**
 	 * A regular expression to match legal word-trailing characters
 	 * which should be merged onto a link of the form [[foo]]bar.