sergiotarxz/Wordpress
sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code Modernisation: Introduce the spread operator in wp-includes/formatting.php.

Browse Source 
Rather than relying `func_get_args()` to retrieve arbitrary function arguments, we can now use the spread operator to assign them directly to a variable.

Props jrf.
See #47678.

git-svn-id: https://develop.svn.wordpress.org/trunk@46128 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2019-09-15 11:05:31 +00:00
parent 3ae54e84da
commit cb1f496cce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-includes/formatting.php
View File

@ -4836,8 +4836,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 = '';
@ -4867,11 +4866,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;
}
/**