Changeset 48390 for trunk/src/wp-admin/update.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/update.php (modified) (2 diffs)

trunk/src/wp-admin/update.php

@@ -158 +158 @@
 
         /* translators: %s: File name. */
-        $title = sprintf( __( 'Installing Plugin from uploaded file: %s' ), esc_html( basename( $file_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 ) ) {
@@ -278 +281 @@
 
         /* 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 ) ) {