From f6d8eeab319f36a6a19661249f866274df31e853 Mon Sep 17 00:00:00 2001 From: jrfnl Date: Thu, 18 Jul 2019 02:51:43 +0200 Subject: [PATCH] Simplify & modernize WP_Ajax_Upgrader_Skin::error() --- src/wp-admin/includes/class-wp-ajax-upgrader-skin.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php b/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php index bb92eeef02..b19e573fb8 100644 --- a/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php +++ b/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php @@ -78,9 +78,10 @@ class WP_Ajax_Upgrader_Skin extends Automatic_Upgrader_Skin { * * @since 4.6.0 * - * @param string|WP_Error $errors Errors. + * @param string|WP_Error $errors Errors. + * @param mixed ...$args Optional text replacements. */ - public function error( $errors ) { + public function error( $errors, ...$args ) { if ( is_string( $errors ) ) { $string = $errors; if ( ! empty( $this->upgrader->strings[ $string ] ) ) { @@ -88,8 +89,6 @@ class WP_Ajax_Upgrader_Skin extends Automatic_Upgrader_Skin { } if ( false !== strpos( $string, '%' ) ) { - $args = func_get_args(); - $args = array_splice( $args, 1 ); if ( ! empty( $args ) ) { $string = vsprintf( $string, $args ); } @@ -104,8 +103,7 @@ class WP_Ajax_Upgrader_Skin extends Automatic_Upgrader_Skin { } } - $args = func_get_args(); - call_user_func_array( array( $this, 'parent::error' ), $args ); + parent::error( $errors, ...$args ); } /** -- 2.21.0.windows.1