* Modified wfMsg behaviour to do transform after substituting variables

* If this works, wfMsg should now work similarly to wfMsgExt with parsemag

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 2677b93..01ebdc7 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -559,9 +559,13 @@ function wfMsgNoDBForContent( $key ) {
  * @return String: the requested message.
  */
 function wfMsgReal( $key, $args, $useDB = true, $forContent=false, $transform = true ) {
+       global $wgMessageCache;
        wfProfileIn( __METHOD__ );
-       $message = wfMsgGetKey( $key, $useDB, $forContent, $transform );
+       $message = wfMsgGetKey( $key, $useDB, $forContent, false );
        $message = wfMsgReplaceArgs( $message, $args );
+       if( $transform && is_object( $wgMessageCache ) ) {
+         $message = $wgMessageCache->transform( $message, !$forContent );
+       }
        wfProfileOut( __METHOD__ );
        return $message;
 }