From 2d0a4779095b47ce3a0e2808b3759d084a8f5721 Mon Sep 17 00:00:00 2001 From: jrfnl Date: Fri, 12 Jul 2019 06:10:12 +0200 Subject: [PATCH] Simplify & modernize wp_sprintf() --- src/wp-includes/formatting.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php index ea7b80d6c2..abfbcbf815 100644 --- a/src/wp-includes/formatting.php +++ b/src/wp-includes/formatting.php @@ -4831,8 +4831,7 @@ function wp_pre_kses_less_than_callback( $matches ) { * @param mixed ...$args Arguments to be formatted into the $pattern string. * @return string The formatted string. */ -function wp_sprintf( $pattern ) { - $args = func_get_args(); +function wp_sprintf( $pattern, ...$args ) { $len = strlen( $pattern ); $start = 0; $result = ''; @@ -4862,11 +4861,12 @@ function wp_sprintf( $pattern ) { if ( $pattern[ $start ] == '%' ) { // Find numbered arguments or take the next one in order if ( preg_match( '/^%(\d+)\$/', $fragment, $matches ) ) { - $arg = isset( $args[ $matches[1] ] ) ? $args[ $matches[1] ] : ''; + $index = $matches[1] - 1; // 0-based array vs 1-based sprintf arguments. + $arg = isset( $args[ $index ] ) ? $args[ $index ] : ''; $fragment = str_replace( "%{$matches[1]}$", '%', $fragment ); } else { - ++$arg_index; $arg = isset( $args[ $arg_index ] ) ? $args[ $arg_index ] : ''; + ++$arg_index; } /** -- 2.21.0.windows.1