Index: trunk/src/wp-admin/includes/class-theme-installer-skin.php =================================================================== --- trunk/src/wp-admin/includes/class-theme-installer-skin.php (revision 47219) +++ trunk/src/wp-admin/includes/class-theme-installer-skin.php (revision 48390) @@ -19,4 +19,8 @@ public $api; public $type; + public $url; + public $overwrite; + + private $is_downgrading = false; /** @@ -25,14 +29,17 @@ public function __construct( $args = array() ) { $defaults = array( - 'type' => 'web', - 'url' => '', - 'theme' => '', - 'nonce' => '', - 'title' => '', + 'type' => 'web', + 'url' => '', + 'theme' => '', + 'nonce' => '', + 'title' => '', + 'overwrite' => '', ); $args = wp_parse_args( $args, $defaults ); - $this->type = $args['type']; - $this->api = isset( $args['api'] ) ? $args['api'] : array(); + $this->type = $args['type']; + $this->url = $args['url']; + $this->api = isset( $args['api'] ) ? $args['api'] : array(); + $this->overwrite = $args['overwrite']; parent::__construct( $args ); @@ -52,6 +59,30 @@ /** + * Hides the `process_failed` error when updating a theme by uploading a zip file. + * + * @since 5.5.0 + * + * @param $wp_error WP_Error. + * @return bool + */ + public function hide_process_failed( $wp_error ) { + if ( + 'upload' === $this->type && + '' === $this->overwrite && + $wp_error->get_error_code() === 'folder_exists' + ) { + return true; + } + + return false; + } + + /** */ public function after() { + if ( $this->do_overwrite() ) { + return; + } + if ( empty( $this->upgrader->result['destination_name'] ) ) { return; @@ -131,4 +162,6 @@ if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() || ! current_user_can( 'switch_themes' ) ) { unset( $install_actions['activate'], $install_actions['preview'] ); + } elseif ( get_option( 'template' ) === $stylesheet ) { + unset( $install_actions['activate'] ); } @@ -148,3 +181,176 @@ } } + + /** + * Check if the theme can be overwritten and output the HTML for overwriting a theme on upload. + * + * @since 5.5.0 + * + * @return bool Whether the theme can be overwritten and HTML was outputted. + */ + private function do_overwrite() { + if ( 'upload' !== $this->type || ! is_wp_error( $this->result ) || 'folder_exists' !== $this->result->get_error_code() ) { + return false; + } + + $folder = $this->result->get_error_data( 'folder_exists' ); + $folder = rtrim( $folder, '/' ); + + $current_theme_data = false; + $all_themes = wp_get_themes( array( 'errors' => null ) ); + + foreach ( $all_themes as $theme ) { + if ( rtrim( $theme->get_stylesheet_directory(), '/' ) !== $folder ) { + continue; + } + + $current_theme_data = $theme; + } + + if ( empty( $current_theme_data ) || empty( $this->upgrader->new_theme_data ) ) { + return false; + } + + echo '
' . esc_html( __( 'Current' ) ) . ' | ' . esc_html( __( 'Uploaded' ) ) . ' | ||
---|---|---|---|
' . $label . ' | ' . esc_html( $old_value ) . ' | '; + $table .= ( $diff_field || $diff_version || $invalid_parent ) ? '' : ' | '; + $table .= esc_html( $new_value ) . ' |
' . esc_html( __( 'The theme cannot be updated due to the following:' ) ) . '
'; + $blocked_message .= '' . $warning . '
'; + + $overwrite = $this->is_downgrading ? 'downgrade-theme' : 'update-theme'; + + $install_actions['ovewrite_theme'] = sprintf( + '%s', + wp_nonce_url( add_query_arg( 'overwrite', $overwrite, $this->url ), 'theme-upload' ), + esc_html( __( 'Replace current with uploaded' ) ) + ); + } else { + echo $blocked_message; + } + + $install_actions['themes_page'] = sprintf( + '%s', + self_admin_url( 'theme-install.php' ), + __( 'Cancel and go back' ) + ); + + /** + * Filters the list of action links available following a single theme installation failed but ovewrite is allowed. + * + * @since 5.5.0 + * + * @param string[] $install_actions Array of theme action links. + * @param object $api Object containing WordPress.org API theme data. + * @param array $new_theme_data Array with uploaded theme data. + */ + $install_actions = apply_filters( 'install_theme_ovewrite_actions', $install_actions, $this->api, $this->upgrader->new_theme_data ); + + if ( ! empty( $install_actions ) ) { + echo '' . implode( ' ', (array) $install_actions ) . '
'; + } + + return true; + } + }