Changeset 48493 for trunk/src/wp-admin/includes/class-theme-upgrader.php

Timestamp:

07/16/2020 01:17:13 PM (5 years ago)

Author:

SergeyBiryukov

Message:

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.

File:

• trunk/src/wp-admin/includes/class-theme-upgrader.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-theme-upgrader.php

@@ -95 +95 @@
         $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.' );
+        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.' );
+            }
         }
     }