Changeset 26262

Timestamp:

11/19/2013 04:07:47 AM (11 years ago)

Author:

dd32

Message:

Plugin Deletion: Properly clear the cache when multiple plugins are deleted. Props jdgrimes. Fixes #26065

File:

• trunk/src/wp-admin/includes/plugin.php (modified) (1 diff)

trunk/src/wp-admin/includes/plugin.php

@@ -804 +804 @@
     }
 
+    // Remove deleted plugins from the plugin updates list.
+    if ( $current = get_site_transient('update_plugins') ) {
+        // Don't remove the plugins that weren't deleted.
+        $deleted = array_diff( $plugins, $errors );
+        
+        foreach ( $deleted as $plugin_file ) {
+            unset( $current->response[ $plugin_file ] );
+        }
+
+        set_site_transient( 'update_plugins', $current );
+    }
+
     if ( ! empty($errors) )
         return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)) );
-
-    // Force refresh of plugin update information
-    if ( $current = get_site_transient('update_plugins') ) {
-        unset( $current->response[ $plugin_file ] );
-        set_site_transient('update_plugins', $current);
-    }
 
     return true;