From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Thu, 8 Jul 2010 09:08:03 +0000 (+0000)
Subject: Simplify wfMsgGetKey
X-Git-Tag: 1.31.0-rc.0~36213
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=a22f0c6f2fb579b2583a330a6964d2f00181816b;p=lhc%2Fweb%2Fwiklou.git

Simplify wfMsgGetKey
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 314b37d3d8..5236e207ea 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -697,35 +697,22 @@ function wfMsgWeirdKey( $key ) {
  *                  behaves as a content language switch if it is a boolean.
  * @param $transform Boolean: whether to parse magic words, etc.
  * @return string
- * @private
  */
 function wfMsgGetKey( $key, $useDB, $langCode = false, $transform = true ) {
 	global $wgContLang, $wgMessageCache;
 
 	wfRunHooks('NormalizeMessageKey', array(&$key, &$useDB, &$langCode, &$transform));
 	
-	# If $wgMessageCache isn't initialised yet, try to return something sensible.
-	if( is_object( $wgMessageCache ) ) {
-		$message = $wgMessageCache->get( $key, $useDB, $langCode );
-		if( $message === false ){
-			$message = '&lt;' . htmlspecialchars( $key ) . '&gt;';
-		} elseif ( $transform ) {
-			$message = $wgMessageCache->transform( $message );
-		}
-	} else {
-		$lang = wfGetLangObj( $langCode );
-
-		# MessageCache::get() does this already, Language::getMessage() doesn't
-		# ISSUE: Should we try to handle "message/lang" here too?
-		$key = str_replace( ' ' , '_' , $wgContLang->lcfirst( $key ) );
-
-		if( is_object( $lang ) ) {
-			$message = $lang->getMessage( $key );
-		} else {
-			$message = false;
-		}
+	if ( !is_object( $wgMessageCache ) ) {
+		throw new MWException( "Trying to get message before message cache is initialised" );
 	}
 
+	$message = $wgMessageCache->get( $key, $useDB, $langCode );
+	if( $message === false ){
+		$message = '&lt;' . htmlspecialchars( $key ) . '&gt;';
+	} elseif ( $transform ) {
+		$message = $wgMessageCache->transform( $message );
+	}
 	return $message;
 }