Changeset 39211

Timestamp:

11/13/2016 09:52:49 AM (10 years ago)

Author:

dd32

Message:

Updates: Allow background updates to update multiple plugins/themes in the same request.
Due to the clear_update_cache parameter not being respected, update caches were being cleared incorrectly which prevented multiple plugins to be updated at the same time in background updates - failing with a fs_unavailable error message.

Fixes #38024

Location:

trunk/src/wp-admin/includes

Files:

• class-plugin-upgrader.php (modified) (5 diffs)
• class-theme-upgrader.php (modified) (5 diffs)

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

@@ -102 +102 @@
 
                 add_filter('upgrader_source_selection', array($this, 'check_package') );
-                // Clear cache so wp_update_plugins() knows about the new plugin.
-                add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
+                if ( $parsed_args['clear_update_cache'] ) {
+                        // Clear cache so wp_update_plugins() knows about the new plugin.
+                        add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
+                }
 
                 $this->run( array(
@@ -169 +171 @@
                 add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
                 //'source_selection' => array($this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
-                // Clear cache so wp_update_plugins() knows about the new plugin.
-                add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
+                if ( $parsed_args['clear_update_cache'] ) {
+                        // Clear cache so wp_update_plugins() knows about the new plugin.
+                        add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
+                }
 
                 $this->run( array(
@@ -228 +232 @@
 
                 add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
-                add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
 
                 $this->skin->header();
@@ -295 +298 @@
                 $this->maintenance_mode(false);
 
+                // Force refresh of plugin update information.
+                wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+
                 /** This action is documented in wp-admin/includes/class-wp-upgrader.php */
                 do_action( 'upgrader_process_complete', $this, array(
@@ -308 +314 @@
 
                 // Cleanup our hooks, in case something else does a upgrade on this connection.
-                remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
                 remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
-
-                // Force refresh of plugin update information.
-                wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
 
                 return $results;

trunk/src/wp-admin/includes/class-theme-upgrader.php

@@ -202 +202 @@
                 add_filter('upgrader_source_selection', array($this, 'check_package') );
                 add_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'), 10, 3);
-                // Clear cache so wp_update_themes() knows about the new theme.
-                add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
+                if ( $parsed_args['clear_update_cache'] ) {
+                        // Clear cache so wp_update_themes() knows about the new theme.
+                        add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
+                }
 
                 $this->run( array(
@@ -270 +272 @@
                 add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
                 add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4);
-                // Clear cache so wp_update_themes() knows about the new theme.
-                add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
+                if ( $parsed_args['clear_update_cache'] ) {
+                        // Clear cache so wp_update_themes() knows about the new theme.
+                        add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
+                }
 
                 $this->run( array(
@@ -330 +334 @@
                 add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
                 add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4);
-                // Clear cache so wp_update_themes() knows about the new theme.
-                add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
 
                 $this->skin->header();
@@ -395 +397 @@
                 $this->maintenance_mode(false);
 
+                // Refresh the Theme Update information
+                wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
+
                 /** This action is documented in wp-admin/includes/class-wp-upgrader.php */
                 do_action( 'upgrader_process_complete', $this, array(
@@ -408 +413 @@
 
                 // Cleanup our hooks, in case something else does a upgrade on this connection.
-                remove_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9 );
                 remove_filter('upgrader_pre_install', array($this, 'current_before'));
                 remove_filter('upgrader_post_install', array($this, 'current_after'));
                 remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme'));
-
-                // Refresh the Theme Update information
-                wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
 
                 return $results;