diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/includes/class-theme-upgrader-skin.php --- a/wp/wp-admin/includes/class-theme-upgrader-skin.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/includes/class-theme-upgrader-skin.php Mon Oct 14 18:28:13 2019 +0200 @@ -19,16 +19,20 @@ public $theme = ''; /** - * * @param array $args */ - public function __construct($args = array()) { - $defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') ); - $args = wp_parse_args($args, $defaults); + public function __construct( $args = array() ) { + $defaults = array( + 'url' => '', + 'theme' => '', + 'nonce' => '', + 'title' => __( 'Update Theme' ), + ); + $args = wp_parse_args( $args, $defaults ); $this->theme = $args['theme']; - parent::__construct($args); + parent::__construct( $args ); } /** @@ -38,37 +42,50 @@ $update_actions = array(); if ( ! empty( $this->upgrader->result['destination_name'] ) && $theme_info = $this->upgrader->theme_info() ) { - $name = $theme_info->display('Name'); + $name = $theme_info->display( 'Name' ); $stylesheet = $this->upgrader->result['destination_name']; $template = $theme_info->get_template(); - $activate_link = add_query_arg( array( - 'action' => 'activate', - 'template' => urlencode( $template ), - 'stylesheet' => urlencode( $stylesheet ), - ), admin_url('themes.php') ); + $activate_link = add_query_arg( + array( + 'action' => 'activate', + 'template' => urlencode( $template ), + 'stylesheet' => urlencode( $stylesheet ), + ), + admin_url( 'themes.php' ) + ); $activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet ); $customize_url = add_query_arg( array( - 'theme' => urlencode( $stylesheet ), + 'theme' => urlencode( $stylesheet ), 'return' => urlencode( admin_url( 'themes.php' ) ), ), admin_url( 'customize.php' ) ); if ( get_stylesheet() == $stylesheet ) { if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { - $update_actions['preview'] = '' . sprintf( __( 'Customize “%s”' ), $name ) . ''; + $update_actions['preview'] = ''; + $update_actions['preview'] .= ''; + /* translators: %s: theme name */ + $update_actions['preview'] .= '' . sprintf( __( 'Customize “%s”' ), $name ) . ''; } } elseif ( current_user_can( 'switch_themes' ) ) { if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { - $update_actions['preview'] = '' . sprintf( __( 'Live Preview “%s”' ), $name ) . ''; + $update_actions['preview'] = ''; + $update_actions['preview'] .= ''; + /* translators: %s: theme name */ + $update_actions['preview'] .= '' . sprintf( __( 'Live Preview “%s”' ), $name ) . ''; } - $update_actions['activate'] = '' . sprintf( __( 'Activate “%s”' ), $name ) . ''; + $update_actions['activate'] = ''; + $update_actions['activate'] .= ''; + /* translators: %s: theme name */ + $update_actions['activate'] .= '' . sprintf( __( 'Activate “%s”' ), $name ) . ''; } - if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() ) + if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() ) { unset( $update_actions['preview'], $update_actions['activate'] ); + } } $update_actions['themes_page'] = '' . __( 'Return to Themes page' ) . ''; @@ -78,12 +95,13 @@ * * @since 2.8.0 * - * @param array $update_actions Array of theme action links. - * @param string $theme Theme directory name. + * @param string[] $update_actions Array of theme action links. + * @param string $theme Theme directory name. */ $update_actions = apply_filters( 'update_theme_complete_actions', $update_actions, $this->theme ); - if ( ! empty($update_actions) ) - $this->feedback(implode(' | ', (array)$update_actions)); + if ( ! empty( $update_actions ) ) { + $this->feedback( implode( ' | ', (array) $update_actions ) ); + } } }