diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
| commit | 6dc1997577fab2c366781fd7048144935afa0012 (patch) | |
| tree | 8918d28c7ab4342f0738985e37af1dfc42d0e93a /includes/logging/LogFormatter.php | |
| parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
| parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) | |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
Diffstat (limited to 'includes/logging/LogFormatter.php')
| -rw-r--r-- | includes/logging/LogFormatter.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php index 9c2fdd35..f31a42aa 100644 --- a/includes/logging/LogFormatter.php +++ b/includes/logging/LogFormatter.php @@ -193,6 +193,8 @@ class LogFormatter { * @return string Text */ public function getIRCActionText() { + global $wgContLang; + $this->plaintext = true; $this->irctext = true; @@ -271,6 +273,10 @@ class LogFormatter { $text = wfMessage( 'modifiedarticleprotection' ) ->rawParams( $target . ' ' . $parameters[0] )->inContentLanguage()->escaped(); break; + case 'move_prot': + $text = wfMessage( 'movedarticleprotection' ) + ->rawParams( $target, $parameters['4::oldtitle'] )->inContentLanguage()->escaped(); + break; } break; @@ -338,7 +344,6 @@ class LogFormatter { case 'block': switch ( $entry->getSubtype() ) { case 'block': - global $wgContLang; // Keep compatibility with extensions by checking for // new key (5::duration/6::flags) or old key (0/optional 1) if ( $entry->isLegacy() ) { @@ -358,7 +363,6 @@ class LogFormatter { ->rawParams( $target )->inContentLanguage()->escaped(); break; case 'reblock': - global $wgContLang; $duration = $wgContLang->translateBlockExpiry( $parameters['5::duration'] ); $flags = BlockLogFormatter::formatBlockFlags( $parameters['6::flags'], $wgContLang ); $text = wfMessage( 'reblock-logentry' ) @@ -790,7 +794,7 @@ class LogFormatter { break; case 'number': - if ( ctype_digit( $value ) ) { + if ( ctype_digit( $value ) || is_int( $value ) ) { $value = (int)$value; } else { $value = (float)$value; |