Ticket #26065: 26065.diff

src/wp-admin/includes/plugin.php

@@ -803 +803 @@
                         $errors[] = $plugin_file;
         }
 
+        // Remove deleted plugins from the plugin updates list.
+        if ( $current = get_site_transient('update_plugins') ) {
+                $deleted = array_diff( $plugins, $errors ); // Don't remove the plugins that weren't deleted.
+
+                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;
 }