From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sun, 11 Feb 2007 06:31:06 +0000 (+0000)
Subject: * Get messages to actually transform (use magic phrases)
X-Git-Tag: 1.31.0-rc.0~54061
X-Git-Url: http://git.cyclocoop.org/clavettes/images/siteon3.jpg?a=commitdiff_plain;h=123f2fe6e58047666e89ef8406f7dedfb3c7ea47;p=lhc%2Fweb%2Fwiklou.git

* Get messages to actually transform (use magic phrases)
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index dbddf1f53b..c01520d1b2 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -380,10 +380,15 @@ function wfMsgNoDBForContent( $key ) {
  * @return String: the requested message.
  */
 function wfMsgReal( $key, $args, $useDB = true, $forContent=false, $transform = true ) {
+	global $wgMessageCache;
+	
 	$fname = 'wfMsgReal';
 	wfProfileIn( $fname );
-	$message = wfMsgGetKey( $key, $useDB, $forContent, $transform );
+	$message = wfMsgGetKey( $key, $useDB, $forContent, false);
 	$message = wfMsgReplaceArgs( $message, $args );
+	if ( $transform && isset( $wgMessageCache ) ) {
+		$message = $wgMessageCache->transform( $message );
+	}
 	wfProfileOut( $fname );
 	return $message;
 }