* Support named arguments to wfMsg* like wfMsg( 'msg', array( 'foo' => 'bar' ) )

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 3d0ac19..5666072 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -408,13 +408,17 @@ function wfMsgReplaceArgs( $message, $args ) {
        # Some messages are split with explode("\n", $msg)
        $message = str_replace( "\r", '', $message );
 
-       # Replace arguments
-       if( count( $args ) ) {
-               foreach( $args as $n => $param ) {
+       // Replace arguments
+       if ( count( $args ) )
+               if ( is_array( $args[0] ) )
+                       foreach ( $args[0] as $key => $val )
+                               $message = str_replace( '$' . $key, $val, $message );
+       else {
+               foreach( $args as $n => $param )
                        $replacementKeys['$' . ($n + 1)] = $param;
-               }
                $message = strtr( $message, $replacementKeys );
        }
+       
        return $message;
 }