Ticket #33283: 33283.diff

src/wp-admin/plugins.php

@@ -88 +88 @@
                         }
 
                         if ( empty($plugins) ) {
-                                wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+                                wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s&empty=$action") );
                                 exit;
                         }
 
@@ -115 +115 @@
                         else
                                 $plugins = array();
 
+                        if ( empty( $plugins ) ) {
+                                wp_redirect( self_admin_url( "plugins.php?plugin_status=$status&paged=$page&s=$s&empty=$action" ) );
+                                exit;
+                        }
+
                         $title = __( 'Update Plugins' );
                         $parent_file = 'plugins.php';
 
@@ -195 +200 @@
                                 $plugins = array_diff( $plugins, array_filter( $plugins, 'is_plugin_active_for_network' ) );
                         }
                         if ( empty($plugins) ) {
-                                wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+                                wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s&empty=$action") );
                                 exit;
                         }
 
@@ -221 +226 @@
                         //$_POST = from the plugin form; $_GET = from the FTP details screen.
                         $plugins = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array();
                         if ( empty( $plugins ) ) {
-                                wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+                                wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s&empty=$action") );
                                 exit;
                         }
 
@@ -443 +448 @@
         <div id="message" class="updated notice is-dismissible"><p><?php _e('Selected plugins <strong>deactivated</strong>.'); ?></p></div>
 <?php elseif ( 'update-selected' == $action ) : ?>
         <div id="message" class="updated notice is-dismissible"><p><?php _e('No out of date plugins were selected.'); ?></p></div>
+<?php elseif ( isset($_GET['empty']) ) :
+        $previous_action = str_replace( '-selected', '', $_GET['empty'] ); ?>
+        <div id="message" class="error notice is-dismissible"><p><?php printf( __('Please select one or more plugins to %s.'), $previous_action ); ?></p></div>
 <?php endif; ?>
 
 <div class="wrap">