Ticket #20578: 20578.diff

src/wp-admin/includes/plugin.php

@@ -752 +752 @@
  *
  * @param array  $plugins    List of plugins to delete.
  * @param string $deprecated Deprecated.
+ * @param bool   $uninstall  Optional. Whether the plugin install routine should be run. Default true.
  * @return bool|null|WP_Error True on success, false is $plugins is empty, WP_Error on failure.
  *                            Null if filesystem credentials are required to proceed.
  */
-function delete_plugins( $plugins, $deprecated = '' ) {
+function delete_plugins( $plugins, $deprecated = '', $uninstall = true ) {
         global $wp_filesystem;
 
         if ( empty($plugins) )
@@ -812 +813 @@
 
         foreach ( $plugins as $plugin_file ) {
                 // Run Uninstall hook.
-                if ( is_uninstallable_plugin( $plugin_file ) ) {
+                if ( is_uninstallable_plugin( $plugin_file ) && $uninstall ) {
                         uninstall_plugin($plugin_file);
                 }
 
@@ -820 +821 @@
                  * Fires immediately before a plugin deletion attempt.
                  *
                  * @since 4.4.0
+                 * @since 4.5.0 Added the `$uninstall` parameter.
                  *
                  * @param string $plugin_file Plugin file name.
+                 * @param bool   $uninstall   Whether the plugin uninstall routine was run.
                  */
-                do_action( 'delete_plugin', $plugin_file );
+                do_action( 'delete_plugin', $plugin_file, $uninstall );
 
                 $this_plugin_dir = trailingslashit( dirname( $plugins_dir . $plugin_file ) );
 
@@ -838 +841 @@
                  * Fires immediately after a plugin deletion attempt.
                  *
                  * @since 4.4.0
+                 * @since 4.5.0 Added the `$uninstall` parameter.
                  *
                  * @param string $plugin_file Plugin file name.
                  * @param bool   $deleted     Whether the plugin deletion was successful.
+                 * @param bool   $uninstall   Whether the plugin uninstall routine was run.
                  */
-                do_action( 'deleted_plugin', $plugin_file, $deleted );
+                do_action( 'deleted_plugin', $plugin_file, $deleted, $uninstall );
 
                 if ( ! $deleted ) {
                         $errors[] = $plugin_file;

src/wp-admin/plugins.php

@@ -227 +227 @@
                         exit;
 
                 case 'delete-selected':
+                case 'delete-selected-no-uninstall':
                         if ( ! current_user_can('delete_plugins') ) {
                                 wp_die(__('You do not have sufficient permissions to delete plugins for this site.'));
                         }
@@ -320 +321 @@
                                                 $data_to_delete = false;
                                                 foreach ( $plugin_info as $plugin ) {
                                                         if ( $plugin['is_uninstallable'] ) {
-                                                                /* translators: 1: plugin name, 2: plugin author */
-                                                                echo '<li>', sprintf( __( '<strong>%1$s</strong> by <em>%2$s</em> (will also <strong>delete its data</strong>)' ), $plugin['Name'], $plugin['AuthorName'] ), '</li>';
                                                                 $data_to_delete = true;
-                                                        } else {
-                                                                /* translators: 1: plugin name, 2: plugin author */
-                                                                echo '<li>', sprintf( __('<strong>%1$s</strong> by <em>%2$s</em>' ), $plugin['Name'], $plugin['AuthorName'] ), '</li>';
                                                         }
+
+                                                        /* translators: 1: plugin name, 2: plugin author */
+                                                        echo '<li>', sprintf( __( '<strong>%1$s</strong> by <em>%2$s</em>' ), $plugin['Name'], $plugin['AuthorName'] ), '</li>';
                                                 }
                                                 ?>
                                         </ul>
@@ -336 +335 @@
                                 else
                                         _e('Are you sure you wish to delete these files?');
                                 ?></p>
-                                <form method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
-                                        <input type="hidden" name="verify-delete" value="1" />
-                                        <input type="hidden" name="action" value="delete-selected" />
-                                        <?php
+                                <?php if ( $data_to_delete ) : ?>
+                                        <form method="post" action="<?php echo esc_url( $_SERVER['REQUEST_URI'] ); ?>" style="display:inline;">
+                                                <input type="hidden" name="verify-delete" value="1"/>
+                                                <input type="hidden" name="action" value="delete-selected"/>
+                                                <?php
                                                 foreach ( (array) $plugins as $plugin ) {
                                                         echo '<input type="hidden" name="checked[]" value="' . esc_attr( $plugin ) . '" />';
                                                 }
-                                        ?>
-                                        <?php wp_nonce_field('bulk-plugins') ?>
-                                        <?php submit_button( $data_to_delete ? __( 'Yes, delete these files and data' ) : __( 'Yes, delete these files' ), 'button', 'submit', false ); ?>
-                                </form>
+                                                ?>
+                                                <?php wp_nonce_field( 'bulk-plugins' ) ?>
+                                                <?php submit_button( __( 'Yes, delete these files and data' ), 'primary', 'submit', false ); ?>
+                                        </form>
+                                        <form method="post" action="<?php echo esc_url( $_SERVER['REQUEST_URI'] ); ?>" style="display:inline;">
+                                                <input type="hidden" name="verify-delete" value="1"/>
+                                                <input type="hidden" name="action" value="delete-selected-no-uninstall"/>
+                                                <?php
+                                                foreach ( (array) $plugins as $plugin ) {
+                                                        echo '<input type="hidden" name="checked[]" value="' . esc_attr( $plugin ) . '" />';
+                                                }
+                                                ?>
+                                                <?php wp_nonce_field( 'bulk-plugins' ) ?>
+                                                <?php submit_button( __( 'Delete files only' ), 'secondary', 'submit', false ); ?>
+                                        </form>
+                                <?php else : ?>
+                                        <form method="post" action="<?php echo esc_url( $_SERVER['REQUEST_URI'] ); ?>" style="display:inline;">
+                                                <input type="hidden" name="verify-delete" value="1"/>
+                                                <input type="hidden" name="action" value="delete-selected"/>
+                                                <?php
+                                                foreach ( (array) $plugins as $plugin ) {
+                                                        echo '<input type="hidden" name="checked[]" value="' . esc_attr( $plugin ) . '" />';
+                                                }
+                                                ?>
+                                                <?php wp_nonce_field( 'bulk-plugins' ) ?>
+                                                <?php submit_button( __( 'Yes, delete these files' ), 'primary', 'submit', false ); ?>
+                                        </form>
+                                <?php endif; ?>
                                 <?php
-                                $referer = wp_get_referer();
+                                $referer    = wp_get_referer();
+                                $return_url = $referer ? esc_url( $referer ) : esc_url( self_admin_url( 'plugins.php' ) );
                                 ?>
-                                <form method="post" action="<?php echo $referer ? esc_url( $referer ) : ''; ?>" style="display:inline;">
-                                        <?php submit_button( __( 'No, return me to the plugin list' ), 'button', 'submit', false ); ?>
-                                </form>
+                                <p><a href="<?php echo $return_url; ?>"><?php _e( 'Return to Plugins page' ); ?></a></p>
 
                                 <p><a href="#" onclick="jQuery('#files-list').toggle(); return false;"><?php _e('Click to view entire list of files which will be deleted'); ?></a></p>
                                 <div id="files-list" style="display:none;">
@@ -372 +395 @@
                                 $plugins_to_delete = count( $plugins );
                         } // endif verify-delete
 
-                        $delete_result = delete_plugins( $plugins );
+                        $delete_result = delete_plugins( $plugins, '', 'delete-selected' === $action );
 
                         set_transient('plugins_delete_result_' . $user_ID, $delete_result); //Store the result in a cache rather than a URL param due to object type & length
                         wp_redirect( self_admin_url("plugins.php?deleted=$plugins_to_delete&plugin_status=$status&paged=$page&s=$s") );