From 0fec84c81cb2e996198ab11697c1b124445eb50f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Sat, 26 Nov 2005 01:13:37 +0000 Subject: [PATCH] * Support named arguments to wfMsg* like wfMsg( 'msg', array( 'foo' => 'bar' ) ) --- includes/GlobalFunctions.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 3d0ac194a8..5666072054 100644 --- 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; } -- 2.20.1