From 64a406687448323d2d5d7db0db3b3ea357eab509 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 16 Jul 2020 13:19:03 +0000 Subject: [PATCH] Upgrade/Install: Check if the theme installer skin's `overwrite` property exists in `Theme_Upgrader::install_strings()`. This ensures consistency with `Plugin_Upgrader::install_strings()` and resolves an issue caused by the property not existing in other upgrader implementations. Props schlessera, azaozz. See #50670. Built from https://develop.svn.wordpress.org/trunk@48493 git-svn-id: http://core.svn.wordpress.org/trunk@48255 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-theme-upgrader.php | 20 +++++++++++--------- wp-includes/version.php | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/wp-admin/includes/class-theme-upgrader.php b/wp-admin/includes/class-theme-upgrader.php index 466bb29796..4ff5109e63 100644 --- a/wp-admin/includes/class-theme-upgrader.php +++ b/wp-admin/includes/class-theme-upgrader.php @@ -94,16 +94,18 @@ class Theme_Upgrader extends WP_Upgrader { /* 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 ( ! empty( $this->skin->overwrite ) ) { + 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.' ); + 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.' ); + } } } diff --git a/wp-includes/version.php b/wp-includes/version.php index 049149ca9b..423cb7f266 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-beta2-48492'; +$wp_version = '5.5-beta2-48493'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.