From ca01d07fddeb0c9b6697f26d4c29d831432b0b80 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Mon, 18 Apr 2011 12:59:50 +0000 Subject: [PATCH] Replace $wgMessageCache with MessageCache::singleton() Fix some tab/space issues Follows up r86304 --- includes/GlobalFunctions.php | 10 +++++----- includes/MessageCache.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 2f83b07d7b..e6af9b7e82 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -716,11 +716,10 @@ function wfMsgHtml( $key ) { * @return string */ function wfMsgWikiHtml( $key ) { - global $wgMessageCache; $args = func_get_args(); array_shift( $args ); return wfMsgReplaceArgs( - $wgMessageCache->parse( wfMsgGetKey( $key, true ), null, /* can't be set to false */ true ), + MessageCache::singleton()->parse( wfMsgGetKey( $key, true ), null, /* can't be set to false */ true ), $args ); } @@ -782,16 +781,17 @@ function wfMsgExt( $key, $options ) { $string = wfMsgReplaceArgs( $string, $args ); } + $messageCache = MessageCache::singleton(); if( in_array( 'parse', $options, true ) ) { - $string = $wgMessageCache->parse( $string, null, true, !$forContent, $langCodeObj ); + $string = $messageCache->parse( $string, null, true, !$forContent, $langCodeObj ); } elseif ( in_array( 'parseinline', $options, true ) ) { - $string = $wgMessageCache->parse( $string, null, true, !$forContent, $langCodeObj ); + $string = $messageCache->parse( $string, null, true, !$forContent, $langCodeObj ); $m = array(); if( preg_match( '/^

(.*)\n?<\/p>\n?$/sU', $string, $m ) ) { $string = $m[1]; } } elseif ( in_array( 'parsemag', $options, true ) ) { - $string = MessageCache::singleton()->transform( $string, + $string = $messageCache->transform( $string, !$forContent, $langCodeObj ); } diff --git a/includes/MessageCache.php b/includes/MessageCache.php index ecb46ac8ad..bd04801909 100644 --- a/includes/MessageCache.php +++ b/includes/MessageCache.php @@ -751,7 +751,7 @@ class MessageCache { } if ( $this->mInParser ) { - return $message; + return $message; } $parser = $this->getParser(); @@ -798,7 +798,7 @@ class MessageCache { */ public function parse( $text, $title = null, $linestart = true, $interface = false, $language = null ) { if ( $this->mInParser ) { - return htmlspecialchars( $text ); + return htmlspecialchars( $text ); } $parser = $this->getParser(); -- 2.20.1