From f6d8eeab319f36a6a19661249f866274df31e853 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
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
|
b
|
class WP_Ajax_Upgrader_Skin extends Automatic_Upgrader_Skin { |
| 78 | 78 | * |
| 79 | 79 | * @since 4.6.0 |
| 80 | 80 | * |
| 81 | | * @param string|WP_Error $errors Errors. |
| | 81 | * @param string|WP_Error $errors Errors. |
| | 82 | * @param mixed ...$args Optional text replacements. |
| 82 | 83 | */ |
| 83 | | public function error( $errors |
| | 84 | public function error( $errors, ...$args ) { |
| 84 | 85 | if ( is_string( $errors ) ) { |
| 85 | 86 | $string = $errors; |
| 86 | 87 | if ( ! empty( $this->upgrader->strings[ $string ] ) ) { |
| … |
… |
class WP_Ajax_Upgrader_Skin extends Automatic_Upgrader_Skin { |
| 88 | 89 | } |
| 89 | 90 | |
| 90 | 91 | if ( false !== strpos( $string, '%' ) ) { |
| 91 | | $args = func_get_args(); |
| 92 | | $args = array_splice( $args, 1 ); |
| 93 | 92 | if ( ! empty( $args ) ) { |
| 94 | 93 | $string = vsprintf( $string, $args ); |
| 95 | 94 | } |
| … |
… |
class WP_Ajax_Upgrader_Skin extends Automatic_Upgrader_Skin { |
| 104 | 103 | } |
| 105 | 104 | } |
| 106 | 105 | |
| 107 | | $args = func_get_args(); |
| 108 | | call_user_func_array( array( $this, 'parent::error' ), $args ); |
| | 106 | parent::error( $errors, ...$args ); |
| 109 | 107 | } |
| 110 | 108 | |
| 111 | 109 | /** |