From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 12 Feb 2007 21:33:22 +0000 (+0000)
Subject: Revert r19877; no reason is given for it but it breaks things such as parameter subst... 
X-Git-Tag: 1.31.0-rc.0~54054
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=5fa40fe0fbfb379022430c24fcf66392e229d9a5;p=lhc%2Fweb%2Fwiklou.git

Revert r19877; no reason is given for it but it breaks things such as parameter substitution of text that includes {{braces}}. An example of breakage is the automated deletion comments, where it expands template contents unexpectedly
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index c01520d1b2..dbddf1f53b 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -380,15 +380,10 @@ 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, false);
+	$message = wfMsgGetKey( $key, $useDB, $forContent, $transform );
 	$message = wfMsgReplaceArgs( $message, $args );
-	if ( $transform && isset( $wgMessageCache ) ) {
-		$message = $wgMessageCache->transform( $message );
-	}
 	wfProfileOut( $fname );
 	return $message;
 }