jenkins-bot has submitted this change and it was merged.
Change subject: Mark Math-specific functions in core as deprecated
......................................................................
Mark Math-specific functions in core as deprecated
The math specific functions in core are not needed
anymore and should be removed in future versions.
Math can access these settings in the same way as
all other extensions do.
Since Math 2.0 the rendered element has the property
"markerType" => 'nowiki'
Change-Id: I20d3714bed9da864146f133a08cf4ca90eda42ab
(cherry picked from commit 545b712ed4f1a3ac92699dec27414b2850430a64)
---
M RELEASE-NOTES-1.22
M includes/parser/ParserOptions.php
M languages/Language.php
M languages/LanguageConverter.php
4 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 1ee9ecb..8aa2fb4 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -523,6 +523,7 @@
The file never contained any re-usable components. To use it in a skin, load
'mediawiki.legacy.wikibits' (which IEFixes depends on) and that will import
IEFixes automatically if user agent conditions are met.
+* Code specific to the Math extension was marked as deprecated.
== Compatibility ==
diff --git a/includes/parser/ParserOptions.php
b/includes/parser/ParserOptions.php
index bde508a..e12f32d 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -240,6 +240,7 @@
function getExternalLinkTarget() { return
$this->mExternalLinkTarget; }
function getDisableContentConversion() { return
$this->mDisableContentConversion; }
function getDisableTitleConversion() { return
$this->mDisableTitleConversion; }
+ /** @deprecated since 1.22 use User::getOption('math') instead */
function getMath() { $this->optionUsed( 'math'
);
return $this->mMath; }
function getThumbSize() { $this->optionUsed(
'thumbsize' );
@@ -338,6 +339,7 @@
function setExternalLinkTarget( $x ) { return wfSetVar(
$this->mExternalLinkTarget, $x ); }
function disableContentConversion( $x = true ) { return wfSetVar(
$this->mDisableContentConversion, $x ); }
function disableTitleConversion( $x = true ) { return wfSetVar(
$this->mDisableTitleConversion, $x ); }
+ /** @deprecated since 1.22 */
function setMath( $x ) { return wfSetVar(
$this->mMath, $x ); }
function setUserLang( $x ) {
if ( is_string( $x ) ) {
diff --git a/languages/Language.php b/languages/Language.php
index 527f382..b6f0971 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -63,6 +63,7 @@
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; }
function translate( $text, $variant ) { return $text; }
@@ -3811,6 +3812,7 @@
*
* @param $text string
* @return string
+ * @deprecated since 1.22 is no longer used
*/
public function armourMath( $text ) {
return $this->mConverter->armourMath( $text );
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index ccf9b1e..96a71a0 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -1103,6 +1103,7 @@
* @param $text String: text to armour against conversion
* @return String: armoured text where { and } have been converted to
* { and }
+ * @deprecated since 1.22 is no longer used
*/
public function armourMath( $text ) {
// convert '-{' and '}-' to '-{' and '}-' to prevent
--
To view, visit https://gerrit.wikimedia.org/r/93971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I20d3714bed9da864146f133a08cf4ca90eda42ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_22
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Physikerwelt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
