* Fix wfMsg*() replacements; args containing literal $[2-9] were wiped

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e22fa66..5d750c8 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -164,6 +164,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * Wrap message page insertions in a transaction to speed up installation
 * Avoid notice warning on edit with no User-Agent header
 * Various fixes
+* Fix wfMsg*() replacements; args containing literal $[2-9] were wiped
 
 
 === Caveats ===

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 50f6302..367adf3 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -404,15 +404,16 @@ function wfMsgGetKey( $key, $useDB, $forContent = false ) {
  * @access private
  */
 function wfMsgReplaceArgs( $message, $args ) {
-       static $replacementKeys = array( '$1', '$2', '$3', '$4', '$5', '$6', '$7', '$8', '$9' );
-
        # Fix windows line-endings
        # Some messages are split with explode("\n", $msg)
        $message = str_replace( "\r", '', $message );
 
        # Replace arguments
        if( count( $args ) ) {
-               $message = str_replace( $replacementKeys, $args, $message );
+               foreach( $args as $n => $param ) {
+                       $replacementKeys['$' . ($n + 1)] = $param;
+               }
+               $message = strtr( $message, $replacementKeys );
        }
        return $message;
 }