| ' . esc_html( __( 'Current' ) ) . ' | '; + $table .= '' . esc_html( __( 'Uploaded' ) ) . ' | ||
|---|---|---|---|
| ' . $label . ' | ' . esc_html( $old_value ) . ' | '; + $table .= ( $diff_field || $diff_version ) ? '' : ' | '; + $table .= esc_html( $new_value ) . ' |
' . esc_html( __( 'The plugin cannot be updated due to the following:' ) ) . '
'; + $blocked_message .= '' . $warning . '
'; + + $overwrite = $this->is_downgrading ? 'downgrade-plugin' : 'update-plugin'; + + $install_actions['ovewrite_plugin'] = sprintf( + '%s', + wp_nonce_url( add_query_arg( 'overwrite', $overwrite, $this->url ), 'plugin-upload' ), + esc_html( __( 'Replace current with uploaded' ) ) + ); + } else { + echo $blocked_message; + } + + $install_actions['plugins_page'] = sprintf( + '%s', + self_admin_url( 'plugin-install.php' ), + __( 'Cancel and go back' ) + ); + + /** + * Filters the list of action links available following a single plugin installation failed but ovewrite is allowed. + * + * @since 5.5.0 + * + * @param string[] $install_actions Array of plugin action links. + * @param object $api Object containing WordPress.org API plugin data. + * @param array $new_plugin_data Array with uploaded plugin data. + */ + $install_actions = apply_filters( 'install_plugin_ovewrite_actions', $install_actions, $this->api, $this->upgrader->new_plugin_data ); + + if ( ! empty( $install_actions ) ) { + echo '' . implode( ' ', (array) $install_actions ) . '
'; + } + + return true; + } } diff --git a/src/wp-admin/includes/class-plugin-upgrader.php b/src/wp-admin/includes/class-plugin-upgrader.php index 361b7a5c8d..56417a58e0 100644 --- a/src/wp-admin/includes/class-plugin-upgrader.php +++ b/src/wp-admin/includes/class-plugin-upgrader.php @@ -38,6 +38,16 @@ class Plugin_Upgrader extends WP_Upgrader { */ public $bulk = false; + /** + * New plugin info. + * + * @since 5.5.0 + * @var array $new_plugin_data + * + * @see check_package() + */ + public $new_plugin_data = array(); + /** * Initialize the upgrade strings. * @@ -54,6 +64,9 @@ class Plugin_Upgrader extends WP_Upgrader { $this->strings['process_failed'] = __( 'Plugin update failed.' ); $this->strings['process_success'] = __( 'Plugin updated successfully.' ); $this->strings['process_bulk_success'] = __( 'Plugins updated successfully.' ); + + /* translators: 1: Plugin name, 2: Plugin version. */ + $this->strings['process_success_specific'] = __( 'Successfully installed the plugin %1$s %2$s.' ); } /** @@ -67,9 +80,25 @@ class Plugin_Upgrader extends WP_Upgrader { $this->strings['downloading_package'] = sprintf( __( 'Downloading installation package from %s…' ), '%s' ); $this->strings['unpack_package'] = __( 'Unpacking the package…' ); $this->strings['installing_package'] = __( 'Installing the plugin…' ); + $this->strings['remove_old'] = __( 'Removing the current plugin…' ); + $this->strings['remove_old_failed'] = __( 'Could not remove the current plugin.' ); $this->strings['no_files'] = __( 'The plugin contains no files.' ); $this->strings['process_failed'] = __( 'Plugin installation failed.' ); $this->strings['process_success'] = __( 'Plugin installed successfully.' ); + + if ( ! empty( $this->skin->overwrite ) ) { + if ( 'update-plugin' === $this->skin->overwrite ) { + $this->strings['installing_package'] = __( 'Updating the plugin…' ); + $this->strings['process_failed'] = __( 'Plugin update failed.' ); + $this->strings['process_success'] = __( 'Plugin updated successfully.' ); + } + + if ( 'downgrade-plugin' === $this->skin->overwrite ) { + $this->strings['installing_package'] = __( 'Downgrading the plugin…' ); + $this->strings['process_failed'] = __( 'Plugin downgrade failed.' ); + $this->strings['process_success'] = __( 'Plugin downgraded successfully.' ); + } + } } /** @@ -88,9 +117,9 @@ class Plugin_Upgrader extends WP_Upgrader { * @return bool|WP_Error True if the installation was successful, false or a WP_Error otherwise. */ public function install( $package, $args = array() ) { - $defaults = array( 'clear_update_cache' => true, + 'overwrite_package' => false, // Do not overwrite files. ); $parsed_args = wp_parse_args( $args, $defaults ); @@ -107,7 +136,7 @@ class Plugin_Upgrader extends WP_Upgrader { array( 'package' => $package, 'destination' => WP_PLUGIN_DIR, - 'clear_destination' => false, // Do not overwrite files. + 'clear_destination' => $parsed_args['overwrite_package'], 'clear_working' => true, 'hook_extra' => array( 'type' => 'plugin', @@ -126,6 +155,20 @@ class Plugin_Upgrader extends WP_Upgrader { // Force refresh of plugin update information. wp_clean_plugins_cache( $parsed_args['clear_update_cache'] ); + if ( $parsed_args['overwrite_package'] ) { + /** + * Fires when the upgrader has successfully overwritten a currently installed + * plugin or theme with an uploaded zip package. + * + * @since 5.5.0 + * + * @param string $package The package file. + * @param array $new_plugin_data The new plugin data. + * @param string $package_type The package type (plugin or theme). + */ + do_action( 'upgrader_overwrote_package', $package, $this->new_plugin_data, 'plugin' ); + } + return true; } @@ -145,7 +188,6 @@ class Plugin_Upgrader extends WP_Upgrader { * @return bool|WP_Error True if the upgrade was successful, false or a WP_Error object otherwise. */ public function upgrade( $plugin, $args = array() ) { - $defaults = array( 'clear_update_cache' => true, ); @@ -223,7 +265,6 @@ class Plugin_Upgrader extends WP_Upgrader { * @return array|false An array of results indexed by plugin file, or false if unable to connect to the filesystem. */ public function bulk_upgrade( $plugins, $args = array() ) { - $defaults = array( 'clear_update_cache' => true, ); @@ -349,6 +390,8 @@ class Plugin_Upgrader extends WP_Upgrader { public function check_package( $source ) { global $wp_filesystem; + $this->new_plugin_data = array(); + if ( is_wp_error( $source ) ) { return $source; } @@ -359,19 +402,18 @@ class Plugin_Upgrader extends WP_Upgrader { } // Check that the folder contains at least 1 valid plugin. - $plugins_found = false; - $files = glob( $working_directory . '*.php' ); + $files = glob( $working_directory . '*.php' ); if ( $files ) { foreach ( $files as $file ) { $info = get_plugin_data( $file, false, false ); if ( ! empty( $info['Name'] ) ) { - $plugins_found = true; + $this->new_plugin_data = $info; break; } } } - if ( ! $plugins_found ) { + if ( empty( $this->new_plugin_data ) ) { return new WP_Error( 'incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __( 'No valid plugins were found.' ) ); } diff --git a/src/wp-admin/includes/class-theme-installer-skin.php b/src/wp-admin/includes/class-theme-installer-skin.php index f568766086..89835f287f 100644 --- a/src/wp-admin/includes/class-theme-installer-skin.php +++ b/src/wp-admin/includes/class-theme-installer-skin.php @@ -18,22 +18,29 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { public $api; public $type; + public $url; + public $overwrite; + + private $is_downgrading = false; /** * @param array $args */ 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 ); } @@ -50,9 +57,33 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { } } + /** + * 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; } @@ -130,6 +161,8 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { 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'] ); } /** @@ -147,4 +180,177 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { $this->feedback( implode( ' | ', (array) $install_actions ) ); } } + + /** + * 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; + } + } diff --git a/src/wp-admin/includes/class-theme-upgrader.php b/src/wp-admin/includes/class-theme-upgrader.php index d5da2344c7..b26498b3e9 100644 --- a/src/wp-admin/includes/class-theme-upgrader.php +++ b/src/wp-admin/includes/class-theme-upgrader.php @@ -37,6 +37,16 @@ class Theme_Upgrader extends WP_Upgrader { */ public $bulk = false; + /** + * New theme info. + * + * @since 5.5.0 + * @var array $new_theme_data + * + * @see check_package() + */ + public $new_theme_data = array(); + /** * Initialize the upgrade strings. * @@ -65,6 +75,8 @@ class Theme_Upgrader extends WP_Upgrader { $this->strings['downloading_package'] = sprintf( __( 'Downloading installation package from %s…' ), '%s' ); $this->strings['unpack_package'] = __( 'Unpacking the package…' ); $this->strings['installing_package'] = __( 'Installing the theme…' ); + $this->strings['remove_old'] = __( 'Removing the old version of the theme…' ); + $this->strings['remove_old_failed'] = __( 'Could not remove the old theme.' ); $this->strings['no_files'] = __( 'The theme contains no files.' ); $this->strings['process_failed'] = __( 'Theme installation failed.' ); $this->strings['process_success'] = __( 'Theme installed successfully.' ); @@ -79,6 +91,20 @@ class Theme_Upgrader extends WP_Upgrader { $this->strings['parent_theme_install_success'] = __( 'Successfully installed the parent theme, %1$s %2$s.' ); /* translators: %s: Theme name. */ $this->strings['parent_theme_not_found'] = sprintf( __( 'The parent theme could not be found. You will need to install the parent theme, %s, before you can use this child theme.' ), '%s' ); + /* translators: %s: Theme error. */ + $this->strings['current_theme_has_errors'] = __( 'The current theme has the following error: "%s".' ); + + if ( 'update-theme' === $this->skin->overwrite ) { + $this->strings['installing_package'] = __( 'Updating the theme…' ); + $this->strings['process_failed'] = __( 'Theme update failed.' ); + $this->strings['process_success'] = __( 'Theme updated successfully.' ); + } + + if ( 'downgrade-theme' === $this->skin->overwrite ) { + $this->strings['installing_package'] = __( 'Downgrading the theme…' ); + $this->strings['process_failed'] = __( 'Theme downgrade failed.' ); + $this->strings['process_success'] = __( 'Theme downgraded successfully.' ); + } } /** @@ -200,9 +226,9 @@ class Theme_Upgrader extends WP_Upgrader { * @return bool|WP_Error True if the installation was successful, false or a WP_Error object otherwise. */ public function install( $package, $args = array() ) { - $defaults = array( 'clear_update_cache' => true, + 'overwrite_package' => false, // Do not overwrite files. ); $parsed_args = wp_parse_args( $args, $defaults ); @@ -220,7 +246,7 @@ class Theme_Upgrader extends WP_Upgrader { array( 'package' => $package, 'destination' => get_theme_root(), - 'clear_destination' => false, // Do not overwrite files. + 'clear_destination' => $args['overwrite_package'], 'clear_working' => true, 'hook_extra' => array( 'type' => 'theme', @@ -240,6 +266,20 @@ class Theme_Upgrader extends WP_Upgrader { // Refresh the Theme Update information. wp_clean_themes_cache( $parsed_args['clear_update_cache'] ); + if ( $parsed_args['overwrite_package'] ) { + /** + * Fires when the upgrader has successfully overwritten a currently installed + * plugin or theme with an uploaded zip package. + * + * @since 5.5.0 + * + * @param string $package The package file. + * @param array $new_plugin_data The new theme data. + * @param string $package_type The package type (plugin or theme). + */ + do_action( 'upgrader_overwrote_package', $package, $this->new_theme_data, 'theme' ); + } + return true; } @@ -259,7 +299,6 @@ class Theme_Upgrader extends WP_Upgrader { * @return bool|WP_Error True if the upgrade was successful, false or a WP_Error object otherwise. */ public function upgrade( $theme, $args = array() ) { - $defaults = array( 'clear_update_cache' => true, ); @@ -332,7 +371,6 @@ class Theme_Upgrader extends WP_Upgrader { * @return array[]|false An array of results, or false if unable to connect to the filesystem. */ public function bulk_upgrade( $themes, $args = array() ) { - $defaults = array( 'clear_update_cache' => true, ); @@ -461,6 +499,8 @@ class Theme_Upgrader extends WP_Upgrader { public function check_package( $source ) { global $wp_filesystem; + $this->new_theme_data = array(); + if ( is_wp_error( $source ) ) { return $source; } @@ -484,11 +524,16 @@ class Theme_Upgrader extends WP_Upgrader { ); } + // All these headers are needed on Theme_Installer_Skin::do_overwrite(). $info = get_file_data( $working_directory . 'style.css', array( - 'Name' => 'Theme Name', - 'Template' => 'Template', + 'Name' => 'Theme Name', + 'Version' => 'Version', + 'Author' => 'Author', + 'Template' => 'Template', + 'RequiresWP' => 'Requires at least', + 'RequiresPHP' => 'Requires PHP', ) ); @@ -517,6 +562,7 @@ class Theme_Upgrader extends WP_Upgrader { ); } + $this->new_theme_data = $info; return $source; } @@ -640,7 +686,6 @@ class Theme_Upgrader extends WP_Upgrader { * and the last result isn't set. */ public function theme_info( $theme = null ) { - if ( empty( $theme ) ) { if ( ! empty( $this->result['destination_name'] ) ) { $theme = $this->result['destination_name']; @@ -648,7 +693,11 @@ class Theme_Upgrader extends WP_Upgrader { return false; } } - return wp_get_theme( $theme ); + + $theme = wp_get_theme( $theme ); + $theme->cache_delete(); + + return $theme; } } diff --git a/src/wp-admin/includes/class-wp-upgrader-skin.php b/src/wp-admin/includes/class-wp-upgrader-skin.php index e776076d64..26a77ec39a 100644 --- a/src/wp-admin/includes/class-wp-upgrader-skin.php +++ b/src/wp-admin/includes/class-wp-upgrader-skin.php @@ -205,4 +205,16 @@ class WP_Upgrader_Skin { /** */ public function bulk_footer() {} + + /** + * Hides the `process_failed` error message when updating by uploading a zip file. + * + * @since 5.5.0 + * + * @param $wp_error WP_Error + * @return bool + */ + public function hide_process_failed( $wp_error ) { + return false; + } } diff --git a/src/wp-admin/includes/class-wp-upgrader.php b/src/wp-admin/includes/class-wp-upgrader.php index f29eb6cfcd..1a63096892 100644 --- a/src/wp-admin/includes/class-wp-upgrader.php +++ b/src/wp-admin/includes/class-wp-upgrader.php @@ -798,7 +798,10 @@ class WP_Upgrader { $this->skin->set_result( $result ); if ( is_wp_error( $result ) ) { $this->skin->error( $result ); - $this->skin->feedback( 'process_failed' ); + + if ( ! method_exists( $this->skin, 'hide_process_failed' ) || ! $this->skin->hide_process_failed( $result ) ) { + $this->skin->feedback( 'process_failed' ); + } } else { // Installation succeeded. $this->skin->feedback( 'process_success' ); diff --git a/src/wp-admin/includes/plugin-install.php b/src/wp-admin/includes/plugin-install.php index c8f3406f7b..dac564bfa2 100644 --- a/src/wp-admin/includes/plugin-install.php +++ b/src/wp-admin/includes/plugin-install.php @@ -353,7 +353,7 @@ function install_plugins_upload() { diff --git a/src/wp-admin/includes/theme-install.php b/src/wp-admin/includes/theme-install.php index 267ae26a94..bbc132ff4c 100644 --- a/src/wp-admin/includes/theme-install.php +++ b/src/wp-admin/includes/theme-install.php @@ -183,7 +183,7 @@ function install_themes_upload() { filename ) ) ); + $title = sprintf( __( 'Installing plugin from uploaded file: %s' ), esc_html( basename( $file_upload->filename ) ) ); $nonce = 'plugin-upload'; $url = add_query_arg( array( 'package' => $file_upload->id ), 'update.php?action=upload-plugin' ); $type = 'upload'; // Install plugin type, From Web or an Upload. - $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact( 'type', 'title', 'nonce', 'url' ) ) ); - $result = $upgrader->install( $file_upload->package ); + $overwrite = isset( $_GET['overwrite'] ) ? sanitize_text_field( $_GET['overwrite'] ) : ''; + $overwrite = in_array( $overwrite, array( 'update-plugin', 'downgrade-plugin' ), true ) ? $overwrite : ''; + + $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact( 'type', 'title', 'nonce', 'url', 'overwrite' ) ) ); + $result = $upgrader->install( $file_upload->package, array( 'overwrite_package' => $overwrite ) ); if ( $result || is_wp_error( $result ) ) { $file_upload->cleanup(); @@ -277,13 +280,16 @@ if ( isset( $_GET['action'] ) ) { require_once ABSPATH . 'wp-admin/admin-header.php'; /* translators: %s: File name. */ - $title = sprintf( __( 'Installing Theme from uploaded file: %s' ), esc_html( basename( $file_upload->filename ) ) ); + $title = sprintf( __( 'Installing theme from uploaded file: %s' ), esc_html( basename( $file_upload->filename ) ) ); $nonce = 'theme-upload'; $url = add_query_arg( array( 'package' => $file_upload->id ), 'update.php?action=upload-theme' ); $type = 'upload'; // Install theme type, From Web or an Upload. - $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact( 'type', 'title', 'nonce', 'url' ) ) ); - $result = $upgrader->install( $file_upload->package ); + $overwrite = isset( $_GET['overwrite'] ) ? sanitize_text_field( $_GET['overwrite'] ) : ''; + $overwrite = in_array( $overwrite, array( 'update-theme', 'downgrade-theme' ), true ) ? $overwrite : ''; + + $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact( 'type', 'title', 'nonce', 'url', 'overwrite' ) ) ); + $result = $upgrader->install( $file_upload->package, array( 'overwrite_package' => $overwrite ) ); if ( $result || is_wp_error( $result ) ) { $file_upload->cleanup();