Changeset 48417 for trunk/src/wp-admin/update.php

Timestamp:

07/10/2020 06:06:46 AM (4 years ago)

Author:

whyisjake

Message:

Upgrade/Install: Ensure cleanup after canceled update.

Ensure that the uploaded zip is hidden from the media library, where a task will remove failed installs after two hours.

Fixes #50612.

Props psykro, desrosj, joyously, azaozz, noisysocks, whyisjake.

File:

• trunk/src/wp-admin/update.php (modified) (3 diffs)

trunk/src/wp-admin/update.php

@@ -17 +17 @@
 
 require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+
+wp_enqueue_script( 'wp-a11y' );
 
 if ( isset( $_GET['action'] ) ) {
@@ -175 +177 @@
         require_once ABSPATH . 'wp-admin/admin-footer.php';
 
+    } elseif ( 'upload-plugin-cancel-overwrite' === $action ) {
+        if ( ! current_user_can( 'upload_plugins' ) ) {
+            wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
+        }
+
+        check_admin_referer( 'plugin-upload-cancel-overwrite' );
+
+        // Make sure the attachment still exists, or File_Upload_Upgrader will call wp_die()
+        // that shows a generic "Please select a file" error.
+        if ( ! empty( $_GET['package'] ) ) {
+            $attachment_id = (int) $_GET['package'];
+
+            if ( get_post( $attachment_id ) ) {
+                $file_upload = new File_Upload_Upgrader( 'pluginzip', 'package' );
+                $file_upload->cleanup();
+            }
+        }
+
+        wp_redirect( self_admin_url( 'plugin-install.php' ) );
+        exit;
     } elseif ( 'upgrade-theme' === $action ) {
 
@@ -298 +320 @@
         require_once ABSPATH . 'wp-admin/admin-footer.php';
 
+    } elseif ( 'upload-theme-cancel-overwrite' === $action ) {
+        if ( ! current_user_can( 'upload_themes' ) ) {
+            wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+        }
+
+        check_admin_referer( 'theme-upload-cancel-overwrite' );
+
+        // Make sure the attachment still exists, or File_Upload_Upgrader will call wp_die()
+        // that shows a generic "Please select a file" error.
+        if ( ! empty( $_GET['package'] ) ) {
+            $attachment_id = (int) $_GET['package'];
+
+            if ( get_post( $attachment_id ) ) {
+                $file_upload = new File_Upload_Upgrader( 'themezip', 'package' );
+                $file_upload->cleanup();
+            }
+        }
+
+        wp_redirect( self_admin_url( 'theme-install.php' ) );
+        exit;
     } else {
         /**