Changeset 48417 for trunk/src/wp-admin/includes/class-plugin-installer-skin.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/includes/class-plugin-installer-skin.php (modified) (3 diffs)

trunk/src/wp-admin/includes/class-plugin-installer-skin.php

@@ -293 +293 @@
 
             $install_actions['ovewrite_plugin'] = sprintf(
-                '<a class="button button-primary" href="%s" target="_parent">%s</a>',
+                '<a class="button button-primary update-from-upload-overwrite" href="%s" target="_parent">%s</a>',
                 wp_nonce_url( add_query_arg( 'overwrite', $overwrite, $this->url ), 'plugin-upload' ),
-                esc_html( __( 'Replace current with uploaded' ) )
+                __( 'Replace current with uploaded' )
             );
         } else {
@@ -301 +301 @@
         }
 
+        $cancel_url = add_query_arg( 'action', 'upload-plugin-cancel-overwrite', $this->url );
+
         $install_actions['plugins_page'] = sprintf(
             '<a class="button" href="%s">%s</a>',
-            self_admin_url( 'plugin-install.php' ),
+            wp_nonce_url( $cancel_url, 'plugin-upload-cancel-overwrite' ),
             __( 'Cancel and go back' )
         );
@@ -319 +321 @@
 
         if ( ! empty( $install_actions ) ) {
+            printf(
+                '<p class="update-from-upload-expired hidden">%s</p>',
+                __( 'The uploaded file has expired. Please go back and upload it again.' )
+            );
             echo '<p class="update-from-upload-actions">' . implode( ' ', (array) $install_actions ) . '</p>';
         }