From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Tue, 21 Jun 2011 07:43:27 +0000 (+0000)
Subject: * Made $useDB parameter of wfMsgGetKey() optional as in wfMsgReal() and removed it... 
X-Git-Tag: 1.31.0-rc.0~29382
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=c92b3ee4a9b3a20a183e283be872e5ef4959e09c;p=lhc%2Fweb%2Fwiklou.git

* Made $useDB parameter of wfMsgGetKey() optional as in wfMsgReal() and removed it where possible
* Removed it from the call to wfMsgReal() in wfMsg() too
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 141bef8552..7069431fb9 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -953,7 +953,7 @@ function wfMessageFallback( /*...*/ ) {
 function wfMsg( $key ) {
 	$args = func_get_args();
 	array_shift( $args );
-	return wfMsgReal( $key, $args, true );
+	return wfMsgReal( $key, $args );
 }
 
 /**
@@ -1051,7 +1051,7 @@ function wfMsgReal( $key, $args, $useDB = true, $forContent = false, $transform
  * @param $transform Boolean: whether to parse magic words, etc.
  * @return string
  */
-function wfMsgGetKey( $key, $useDB, $langCode = false, $transform = true ) {
+function wfMsgGetKey( $key, $useDB = true, $langCode = false, $transform = true ) {
 	wfRunHooks( 'NormalizeMessageKey', array( &$key, &$useDB, &$langCode, &$transform ) );
 
 	$cache = MessageCache::singleton();
@@ -1106,7 +1106,7 @@ function wfMsgReplaceArgs( $message, $args ) {
 function wfMsgHtml( $key ) {
 	$args = func_get_args();
 	array_shift( $args );
-	return wfMsgReplaceArgs( htmlspecialchars( wfMsgGetKey( $key, true ) ), $args );
+	return wfMsgReplaceArgs( htmlspecialchars( wfMsgGetKey( $key ) ), $args );
 }
 
 /**
@@ -1124,7 +1124,7 @@ function wfMsgWikiHtml( $key ) {
 	$args = func_get_args();
 	array_shift( $args );
 	return wfMsgReplaceArgs(
-		MessageCache::singleton()->parse( wfMsgGetKey( $key, true ), null, /* can't be set to false */ true )->getText(),
+		MessageCache::singleton()->parse( wfMsgGetKey( $key ), null, /* can't be set to false */ true )->getText(),
 		$args );
 }