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

Timestamp:

07/07/2020 05:47:37 PM (6 years ago)

Author:

azaozz

Message:

Upgrade/install: Allow plugin and theme updates from a uploaded .zip file.

Props mariovalney, cyberhobo, imath, shaunandrews, mariovalney, earnjam, desrosj, dd32, folletto, swissspidy, melchoyce, pento, joshuawold, psykro, clorith, ahortin, galbaras, pingram3541, joyously, doobeedoo, karmatosed, poena, whyisjake, earnjam, sergeybiryukov, audrasjb, azaozz.

Fixes #9757.

File:

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

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

@@ -39 +39 @@
 
         /**
+         * New theme info.
+         *
+         * @since 5.5.0
+         * @var array $new_theme_data
+         *
+         * @see check_package()
+         */
+        public $new_theme_data = array();
+
+        /**
          * Initialize the upgrade strings.
          *
@@ -66 +76 @@
                 $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.' );
@@ -80 +92 @@
                 /* translators: %s: Theme name. */
                 $this->strings['parent_theme_not_found'] = sprintf( __( '<strong>The parent theme could not be found.</strong> You will need to install the parent theme, %s, before you can use this child theme.' ), '<strong>%s</strong>' );
+                /* 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&#8230;' );
+                        $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&#8230;' );
+                        $this->strings['process_failed']     = __( 'Theme downgrade failed.' );
+                        $this->strings['process_success']    = __( 'Theme downgraded successfully.' );
+                }
         }
 
@@ -201 +227 @@
          */
         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 );
@@ -221 +247 @@
                                 'package'           => $package,
                                 'destination'       => get_theme_root(),
-                                'clear_destination' => false, // Do not overwrite files.
+                                'clear_destination' => $args['overwrite_package'],
                                 'clear_working'     => true,
                                 'hook_extra'        => array(
@@ -241 +267 @@
                 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;
         }
@@ -260 +300 @@
          */
         public function upgrade( $theme, $args = array() ) {
-
                 $defaults    = array(
                         'clear_update_cache' => true,
@@ -333 +372 @@
          */
         public function bulk_upgrade( $themes, $args = array() ) {
-
                 $defaults    = array(
                         'clear_update_cache' => true,
@@ -462 +500 @@
                 global $wp_filesystem;
 
+                $this->new_theme_data = array();
+
                 if ( is_wp_error( $source ) ) {
                         return $source;
@@ -485 +525 @@
                 }
 
+                // 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',
                         )
                 );
@@ -518 +563 @@
                 }
 
+                $this->new_theme_data = $info;
                 return $source;
         }
@@ -641 +687 @@
          */
         public function theme_info( $theme = null ) {
-
                 if ( empty( $theme ) ) {
                         if ( ! empty( $this->result['destination_name'] ) ) {
@@ -649 +694 @@
                         }
                 }
-                return wp_get_theme( $theme );
+
+                $theme = wp_get_theme( $theme );
+                $theme->cache_delete();
+
+                return $theme;
         }