diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/includes/class-theme-installer-skin.php --- a/wp/wp-admin/includes/class-theme-installer-skin.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/includes/class-theme-installer-skin.php Mon Oct 14 18:28:13 2019 +0200 @@ -20,84 +20,105 @@ public $type; /** - * * @param array $args */ - public function __construct($args = array()) { - $defaults = array( 'type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '' ); - $args = wp_parse_args($args, $defaults); + public function __construct( $args = array() ) { + $defaults = array( + 'type' => 'web', + 'url' => '', + 'theme' => '', + 'nonce' => '', + 'title' => '', + ); + $args = wp_parse_args( $args, $defaults ); $this->type = $args['type']; - $this->api = isset($args['api']) ? $args['api'] : array(); + $this->api = isset( $args['api'] ) ? $args['api'] : array(); - parent::__construct($args); + parent::__construct( $args ); } /** */ public function before() { - if ( !empty($this->api) ) - $this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version); + if ( ! empty( $this->api ) ) { + $this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version ); + } } /** */ public function after() { - if ( empty($this->upgrader->result['destination_name']) ) + if ( empty( $this->upgrader->result['destination_name'] ) ) { return; + } $theme_info = $this->upgrader->theme_info(); - if ( empty( $theme_info ) ) + if ( empty( $theme_info ) ) { return; + } - $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 ); $install_actions = array(); if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { - $customize_url = add_query_arg( + $customize_url = add_query_arg( array( - 'theme' => urlencode( $stylesheet ), + 'theme' => urlencode( $stylesheet ), 'return' => urlencode( admin_url( 'web' === $this->type ? 'theme-install.php' : 'themes.php' ) ), ), admin_url( 'customize.php' ) ); - $install_actions['preview'] = '' . sprintf( __( 'Live Preview “%s”' ), $name ) . ''; + $install_actions['preview'] = ''; + $install_actions['preview'] .= ''; + /* translators: %s: theme name */ + $install_actions['preview'] .= '' . sprintf( __( 'Live Preview “%s”' ), $name ) . ''; } - $install_actions['activate'] = '' . sprintf( __( 'Activate “%s”' ), $name ) . ''; - - if ( is_network_admin() && current_user_can( 'manage_network_themes' ) ) - $install_actions['network_enable'] = '' . __( 'Network Enable' ) . ''; + $install_actions['activate'] = ''; + $install_actions['activate'] .= ''; + /* translators: %s: theme name */ + $install_actions['activate'] .= '' . sprintf( __( 'Activate “%s”' ), $name ) . ''; - if ( $this->type == 'web' ) + if ( is_network_admin() && current_user_can( 'manage_network_themes' ) ) { + $install_actions['network_enable'] = '' . __( 'Network Enable' ) . ''; + } + + if ( $this->type == 'web' ) { $install_actions['themes_page'] = '' . __( 'Return to Theme Installer' ) . ''; - elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) + } elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) { $install_actions['themes_page'] = '' . __( 'Return to Themes page' ) . ''; + } - if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) ) + if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() || ! current_user_can( 'switch_themes' ) ) { unset( $install_actions['activate'], $install_actions['preview'] ); + } /** * Filters the list of action links available following a single theme installation. * * @since 2.8.0 * - * @param array $install_actions Array of theme action links. + * @param string[] $install_actions Array of theme action links. * @param object $api Object containing WordPress.org API theme data. * @param string $stylesheet Theme directory name. * @param WP_Theme $theme_info Theme object. */ $install_actions = apply_filters( 'install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info ); - if ( ! empty($install_actions) ) - $this->feedback(implode(' | ', (array)$install_actions)); + if ( ! empty( $install_actions ) ) { + $this->feedback( implode( ' | ', (array) $install_actions ) ); + } } }