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

Timestamp:

07/07/2020 05:47:37 PM (4 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-plugin-upgrader.php (modified) (11 diffs)

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

@@ -40 +40 @@
 
     /**
+     * New plugin info.
+     *
+     * @since 5.5.0
+     * @var array $new_plugin_data
+     *
+     * @see check_package()
+     */
+    public $new_plugin_data = array();
+
+    /**
      * Initialize the upgrade strings.
      *
@@ -55 +65 @@
         $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 <strong>%1$s %2$s</strong>.' );
     }
 
@@ -68 +81 @@
         $this->strings['unpack_package']      = __( 'Unpacking the package&#8230;' );
         $this->strings['installing_package']  = __( 'Installing the plugin&#8230;' );
+        $this->strings['remove_old']          = __( 'Removing the current plugin&#8230;' );
+        $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&#8230;' );
+                $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&#8230;' );
+                $this->strings['process_failed']     = __( 'Plugin downgrade failed.' );
+                $this->strings['process_success']    = __( 'Plugin downgraded successfully.' );
+            }
+        }
     }
 
@@ -89 +118 @@
      */
     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 );
@@ -108 +137 @@
                 '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(
@@ -127 +156 @@
         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;
     }
@@ -146 +189 @@
      */
     public function upgrade( $plugin, $args = array() ) {
-
         $defaults    = array(
             'clear_update_cache' => true,
@@ -224 +266 @@
      */
     public function bulk_upgrade( $plugins, $args = array() ) {
-
         $defaults    = array(
             'clear_update_cache' => true,
@@ -350 +391 @@
         global $wp_filesystem;
 
+        $this->new_plugin_data = array();
+
         if ( is_wp_error( $source ) ) {
             return $source;
@@ -360 +403 @@
 
         // 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;
                 }
@@ -372 +414 @@
         }
 
-        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.' ) );
         }