Merge "wfMsgReplaceArgs: Don't use count(), if the actual amount of entries isn't...

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 4d0ebf6..4066945 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1475,7 +1475,7 @@ function wfMsgReplaceArgs( $message, $args ) {
        $message = str_replace( "\r", '', $message );
 
        // Replace arguments
-       if ( count( $args ) ) {
+       if ( is_array( $args ) && $args ) {
                if ( is_array( $args[0] ) ) {
                        $args = array_values( $args[0] );
                }