| Index: trunk/extensions/Math/Math.body.php |
| — | — | @@ -30,7 +30,7 @@ |
| 31 | 31 | * @ingroup Parser |
| 32 | 32 | */ |
| 33 | 33 | class MathRenderer { |
| 34 | | - var $mode = MW_MATH_MODERN; |
| | 34 | + var $mode = MW_MATH_PNG; |
| 35 | 35 | var $tex = ''; |
| 36 | 36 | var $inputhash = ''; |
| 37 | 37 | var $hash = ''; |
| — | — | @@ -44,7 +44,13 @@ |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | function setOutputMode( $mode ) { |
| 48 | | - $this->mode = $mode; |
| | 48 | + $validModes = array( MW_MATH_PNG, MW_MATH_SOURCE ); |
| | 49 | + if ( in_array( $mode, $validModes ) ) { |
| | 50 | + $this->mode = $mode; |
| | 51 | + } else { |
| | 52 | + // Several mixed modes have been phased out. |
| | 53 | + $this->mode = MW_MATH_PNG; |
| | 54 | + } |
| 49 | 55 | } |
| 50 | 56 | |
| 51 | 57 | function render() { |
| Index: trunk/extensions/Math/Math.php |
| — | — | @@ -31,11 +31,11 @@ |
| 32 | 32 | * Maths constants |
| 33 | 33 | */ |
| 34 | 34 | define( 'MW_MATH_PNG', 0 ); |
| 35 | | -define( 'MW_MATH_SIMPLE', 1 ); |
| 36 | | -define( 'MW_MATH_HTML', 2 ); |
| | 35 | +define( 'MW_MATH_SIMPLE', 1 ); /// @deprecated |
| | 36 | +define( 'MW_MATH_HTML', 2 ); /// @deprecated |
| 37 | 37 | define( 'MW_MATH_SOURCE', 3 ); |
| 38 | | -define( 'MW_MATH_MODERN', 4 ); |
| 39 | | -define( 'MW_MATH_MATHML', 5 ); |
| | 38 | +define( 'MW_MATH_MODERN', 4 ); /// @deprecated |
| | 39 | +define( 'MW_MATH_MATHML', 5 ); /// @deprecated |
| 40 | 40 | /**@}*/ |
| 41 | 41 | |
| 42 | 42 | /** For back-compat */ |
| — | — | @@ -84,6 +84,7 @@ |
| 85 | 85 | |
| 86 | 86 | ////////// end of config settings. |
| 87 | 87 | |
| | 88 | +$wgDefaultUserOptions['math'] = MW_MATH_PNG; |
| 88 | 89 | |
| 89 | 90 | $wgExtensionFunctions[] = 'MathHooks::setup'; |
| 90 | 91 | $wgHooks['ParserFirstCallInit'][] = 'MathHooks::onParserFirstCallInit'; |
| Index: trunk/extensions/Math/Math.hooks.php |
| — | — | @@ -74,11 +74,7 @@ |
| 75 | 75 | private static function getMathNames() { |
| 76 | 76 | return array( |
| 77 | 77 | MW_MATH_PNG => 'mw_math_png', |
| 78 | | - MW_MATH_SIMPLE => 'mw_math_simple', |
| 79 | | - MW_MATH_HTML => 'mw_math_html', |
| 80 | | - MW_MATH_SOURCE => 'mw_math_source', |
| 81 | | - MW_MATH_MODERN => 'mw_math_modern', |
| 82 | | - MW_MATH_MATHML => 'mw_math_mathml' |
| | 78 | + MW_MATH_SOURCE => 'mw_math_source' |
| 83 | 79 | ); |
| 84 | 80 | } |
| 85 | 81 | |