Changeset 34591

Timestamp:

09/26/2015 01:10:05 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Network Admin: Properly pass the number of delete plugins to the corresponding message.

Fixes #33239.

File:

• trunk/src/wp-admin/plugins.php (modified) (2 diffs)

trunk/src/wp-admin/plugins.php

@@ -369 +369 @@
                 require_once(ABSPATH . 'wp-admin/admin-footer.php');
                 exit;
-            } //Endif verify-delete
-            $delete_result = delete_plugins($plugins);
+            } else {
+                $plugins_to_delete = count( $plugins );
+            } // endif verify-delete
+
+            $delete_result = delete_plugins( $plugins );
 
             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=true&plugin_status=$status&paged=$page&s=$s") );
+            wp_redirect( self_admin_url("plugins.php?deleted=$plugins_to_delete&plugin_status=$status&paged=$page&s=$s") );
             exit;
 
@@ -471 +474 @@
             <p>
                 <?php
-                if ( 1 == $plugins_to_delete ) {
+                if ( 1 == (int) $_GET['deleted'] ) {
                     _e( 'The selected plugin has been <strong>deleted</strong>.' );
                 } else {