diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
| commit | c9aa36da061816dee256a979c2ff8d2ee41824d9 (patch) | |
| tree | 29f7002b80ee984b488bd047dbbd80b36bf892e9 /extensions/ParserFunctions/Expr.php | |
| parent | b4274e0e33eafb5e9ead9d949ebf031a9fb8363b (diff) | |
| parent | d1ba966140d7a60cd5ae4e8667ceb27c1a138592 (diff) | |
Merge branch 'archwiki'
# Conflicts:
# skins/ArchLinux.php
# skins/ArchLinux/archlogo.gif
Diffstat (limited to 'extensions/ParserFunctions/Expr.php')
| -rw-r--r-- | extensions/ParserFunctions/Expr.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/extensions/ParserFunctions/Expr.php b/extensions/ParserFunctions/Expr.php index f40158e8..70d9b8d4 100644 --- a/extensions/ParserFunctions/Expr.php +++ b/extensions/ParserFunctions/Expr.php @@ -60,15 +60,14 @@ class ExprError extends MWException { // pfunc_expr_unexpected_closing_bracket, pfunc_expr_unrecognised_punctuation, // pfunc_expr_unclosed_bracket, pfunc_expr_division_by_zero, pfunc_expr_invalid_argument, // pfunc_expr_invalid_argument_ln, pfunc_expr_unknown_error, pfunc_expr_not_a_number - $msg = wfMessage( "pfunc_expr_$msg", $parameter )->inContentLanguage()->escaped(); - $this->message = '<strong class="error">' . $msg . '</strong>'; + $this->message = wfMessage( "pfunc_expr_$msg", $parameter )->inContentLanguage()->text(); } } class ExprParser { - var $maxStackSize = 100; + public $maxStackSize = 100; - var $precedence = array( + public $precedence = array( EXPR_NEGATIVE => 10, EXPR_POSITIVE => 10, EXPR_EXPONENT => 10, @@ -107,7 +106,7 @@ class ExprParser { EXPR_CLOSE => -1, ); - var $names = array( + public $names = array( EXPR_NEGATIVE => '-', EXPR_POSITIVE => '+', EXPR_NOT => 'not', @@ -144,7 +143,7 @@ class ExprParser { EXPR_SQRT => 'sqrt', ); - var $words = array( + public $words = array( 'mod' => EXPR_MOD, 'fmod' => EXPR_FMOD, 'and' => EXPR_AND, |