Merge "remove armourMath and wgContLang (bug 60799)"
This commit is contained in:
commit
90d7783e8e
|
@ -89,10 +89,10 @@ class MathHooks {
|
||||||
* @param $content (the LaTeX input)
|
* @param $content (the LaTeX input)
|
||||||
* @param $attributes
|
* @param $attributes
|
||||||
* @param Parser $parser
|
* @param Parser $parser
|
||||||
* @return string
|
* @return array
|
||||||
*/
|
*/
|
||||||
static function mathTagHook( $content, $attributes, $parser ) {
|
static function mathTagHook( $content, $attributes, $parser ) {
|
||||||
global $wgContLang, $wgUseMathJax, $wgMathDisableTexFilter;
|
global $wgUseMathJax, $wgMathDisableTexFilter;
|
||||||
|
|
||||||
if ( trim( $content ) === '' ) { // bug 8372
|
if ( trim( $content ) === '' ) { // bug 8372
|
||||||
return '';
|
return '';
|
||||||
|
@ -128,10 +128,9 @@ class MathHooks {
|
||||||
$parser->getOutput()->addModuleStyles( array( 'ext.math.styles' ) );
|
$parser->getOutput()->addModuleStyles( array( 'ext.math.styles' ) );
|
||||||
|
|
||||||
$renderer->writeCache();
|
$renderer->writeCache();
|
||||||
$result = $wgContLang->armourMath( $renderedMath );
|
|
||||||
wfProfileOut( __METHOD__ );
|
wfProfileOut( __METHOD__ );
|
||||||
|
|
||||||
return $result;
|
return array( $renderedMath, "markerType" => 'nowiki' );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue