Ticket #38024: 38024.diff

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

@@ -147 +147 @@
 
                 $defaults = array(
                         'clear_update_cache' => true,
+                        'is_multi'           => false
                 );
                 $parsed_args = wp_parse_args( $args, $defaults );
 
@@ -172 +173 @@
                 add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
 
                 $this->run( array(
-                        'package' => $r->package,
-                        'destination' => WP_PLUGIN_DIR,
+                        'package'           => $r->package,
+                        'destination'       => WP_PLUGIN_DIR,
                         'clear_destination' => true,
-                        'clear_working' => true,
-                        'hook_extra' => array(
+                        'clear_working'     => true,
+                        'is_multi'          => $parsed_args['is_multi'],
+                        'hook_extra'        => array(
                                 'plugin' => $plugin,
-                                'type' => 'plugin',
+                                'type'   => 'plugin',
                                 'action' => 'update',
                         ),
                 ) );

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

@@ -248 +248 @@
 
                 $defaults = array(
                         'clear_update_cache' => true,
+                        'is_multi'           => false
                 );
                 $parsed_args = wp_parse_args( $args, $defaults );
 
@@ -273 +274 @@
                 add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
 
                 $this->run( array(
-                        'package' => $r['package'],
-                        'destination' => get_theme_root( $theme ),
+                        'package'           => $r['package'],
+                        'destination'       => get_theme_root( $theme ),
                         'clear_destination' => true,
-                        'clear_working' => true,
-                        'hook_extra' => array(
-                                'theme' => $theme,
-                                'type' => 'theme',
+                        'clear_working'     => true,
+                        'is_multi'          => $parsed_args['is_multi'],
+                        'hook_extra'        => array(
+                                'theme'  => $theme,
+                                'type'   => 'theme',
                                 'action' => 'update',
                         ),
                 ) );

src/wp-admin/includes/class-wp-automatic-updater.php

@@ -335 +335 @@
                         'attempt_rollback'   => true,
                         // Allow relaxed file ownership in some scenarios
                         'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership,
+                        // Allow for multiple updates
+                        'is_multi'           => true
                 ) );
 
                 // If the filesystem is unavailable, false is returned.