diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/includes/class-bulk-upgrader-skin.php
--- a/wp/wp-admin/includes/class-bulk-upgrader-skin.php Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/includes/class-bulk-upgrader-skin.php Mon Oct 14 18:28:13 2019 +0200
@@ -23,52 +23,56 @@
public $error = false;
/**
- *
* @param array $args
*/
- public function __construct($args = array()) {
- $defaults = array( 'url' => '', 'nonce' => '' );
- $args = wp_parse_args($args, $defaults);
+ public function __construct( $args = array() ) {
+ $defaults = array(
+ 'url' => '',
+ 'nonce' => '',
+ );
+ $args = wp_parse_args( $args, $defaults );
- parent::__construct($args);
+ parent::__construct( $args );
}
/**
*/
public function add_strings() {
- $this->upgrader->strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.');
+ $this->upgrader->strings['skin_upgrade_start'] = __( 'The update process is starting. This process may take a while on some hosts, so please be patient.' );
/* translators: 1: Title of an update, 2: Error message */
- $this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: %2$s');
- /* translators: 1: Title of an update */
- $this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
- /* translators: 1: Title of an update */
- $this->upgrader->strings['skin_update_successful'] = __( '%1$s updated successfully.' );
- $this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.');
+ $this->upgrader->strings['skin_update_failed_error'] = __( 'An error occurred while updating %1$s: %2$s' );
+ /* translators: %s: Title of an update */
+ $this->upgrader->strings['skin_update_failed'] = __( 'The update of %s failed.' );
+ /* translators: %s: Title of an update */
+ $this->upgrader->strings['skin_update_successful'] = __( '%s updated successfully.' );
+ $this->upgrader->strings['skin_upgrade_end'] = __( 'All updates have been completed.' );
}
/**
- *
* @param string $string
*/
- public function feedback($string) {
- if ( isset( $this->upgrader->strings[$string] ) )
- $string = $this->upgrader->strings[$string];
+ public function feedback( $string ) {
+ if ( isset( $this->upgrader->strings[ $string ] ) ) {
+ $string = $this->upgrader->strings[ $string ];
+ }
- if ( strpos($string, '%') !== false ) {
+ if ( strpos( $string, '%' ) !== false ) {
$args = func_get_args();
- $args = array_splice($args, 1);
+ $args = array_splice( $args, 1 );
if ( $args ) {
- $args = array_map( 'strip_tags', $args );
- $args = array_map( 'esc_html', $args );
- $string = vsprintf($string, $args);
+ $args = array_map( 'strip_tags', $args );
+ $args = array_map( 'esc_html', $args );
+ $string = vsprintf( $string, $args );
}
}
- if ( empty($string) )
+ if ( empty( $string ) ) {
return;
- if ( $this->in_loop )
+ }
+ if ( $this->in_loop ) {
echo "$string
\n";
- else
+ } else {
echo "
$string
\n"; + } } /** @@ -84,65 +88,64 @@ } /** - * * @param string|WP_Error $error */ - public function error($error) { - if ( is_string($error) && isset( $this->upgrader->strings[$error] ) ) - $this->error = $this->upgrader->strings[$error]; + public function error( $error ) { + if ( is_string( $error ) && isset( $this->upgrader->strings[ $error ] ) ) { + $this->error = $this->upgrader->strings[ $error ]; + } - if ( is_wp_error($error) ) { + if ( is_wp_error( $error ) ) { $messages = array(); foreach ( $error->get_error_messages() as $emessage ) { - if ( $error->get_error_data() && is_string( $error->get_error_data() ) ) + if ( $error->get_error_data() && is_string( $error->get_error_data() ) ) { $messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) ); - else + } else { $messages[] = $emessage; + } } - $this->error = implode(', ', $messages); + $this->error = implode( ', ', $messages ); } - echo ''; + echo ''; } /** */ public function bulk_header() { - $this->feedback('skin_upgrade_start'); + $this->feedback( 'skin_upgrade_start' ); } /** */ public function bulk_footer() { - $this->feedback('skin_upgrade_end'); + $this->feedback( 'skin_upgrade_end' ); } /** - * * @param string $title */ - public function before($title = '') { + public function before( $title = '' ) { $this->in_loop = true; printf( '