Ticket #34676: 34676.4.patch

src/js/_enqueues/admin/common.js

@@ -1569 +1569 @@
                  * notice. Make sure it gets moved just the first time.
                  */
                 if ( ! $progressDiv.hasClass( 'update-details-moved' ) ) {
-                        $progressDiv.insertAfter( $updateNotice ).addClass( 'update-details-moved' );
+                        $progressDiv.( $updateNotice ).addClass( 'update-details-moved' );
                 }
 
                 // Toggle the progress div visibility.

src/wp-admin/css/common.css

@@ -554 +554 @@
         margin-left: 0;
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
 .no-js .widefat thead .check-column input,
 .no-js .widefat tfoot .check-column input {
         display: none;

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

@@ -22 +22 @@
                 parent::add_strings();
                 /* translators: 1: name of plugin being updated, 2: number of updating plugin, 3: total number of plugins being updated */
                 $this->upgrader->strings['skin_before_update_header'] = __( 'Updating Plugin %1$s (%2$d/%3$d)' );
+
         }
 
         /**
-         * @param string $title
+         * Outputs copy before workload output.
+         *
+         * @param string $title Title or string identifier to use.
+         *
+         * @return void
          */
         public function before( $title = '' ) {
-                parent::before( $this->plugin_info['Title'] );
+                $title = ( $title === '' ) ? $this->plugin_info['Title'] : $title;
+                parent::before( $title );
         }
 
         /**
-         * @param string $title
+         * Outputs copy after workload output.
+         *
+         * @param string $title Title or string identifier to use.
+         *
+         * @return void
          */
         public function after( $title = '' ) {
-                parent::after( $this->plugin_info['Title'] );
+                $title = ( $title === '' ) ? $this->plugin_info['Title'] : $title;
+                parent::after( $title );
                 $this->decrement_update_count( 'plugin' );
         }
 
         /**
+
+
+
          */
         public function bulk_footer() {
                 parent::bulk_footer();

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

@@ -16 +16 @@
  * @see Bulk_Upgrader_Skin
  */
 class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
-        public $theme_info = array(); // Theme_Upgrader::bulk_upgrade() will fill this in.
+        /**
+         * Theme information, which will be filled by Theme_Upgrader::bulk_upgrade()
+         * @var array
+         */
+        public $theme_info = array();
 
+
+
+
+
+
         public function add_strings() {
                 parent::add_strings();
                 /* translators: 1: name of theme being updated, 2: number of updating themes, 3: total number of themes being updated */
                 $this->upgrader->strings['skin_before_update_header'] = __( 'Updating Theme %1$s (%2$d/%3$d)' );
+
         }
 
         /**
-         * @param string $title
+         * Outputs copy before workload output.
+         *
+         * @param string $title Title or string identifier to use.
+         *
+         * @return void
          */
         public function before( $title = '' ) {
-                parent::before( $this->theme_info->display( 'Name' ) );
+                $title = ( $title === '' ) ? $this->theme_info->display( 'Name' ) : $title;
+                parent::before( $title );
         }
 
         /**
-         * @param string $title
+         * Outputs copy after workload output.
+         *
+         * @param string $title Title or string identifier to use.
+         *
+         * @return void
          */
         public function after( $title = '' ) {
-                parent::after( $this->theme_info->display( 'Name' ) );
+                $title = ( $title === '' ) ? $this->theme_info->display( 'Name' ) : $title;
+                parent::after( $title );
                 $this->decrement_update_count( 'theme' );
         }
 
         /**
+
+
+
          */
         public function bulk_footer() {
                 parent::bulk_footer();

new file src/wp-admin/includes/class-bulk-upgrade-element-base.php

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

new file src/wp-admin/includes/class-bulk-upgrade-repository-element-base.php

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

new file src/wp-admin/includes/class-bulk-upgrader-base.php

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/wp-admin/includes/class-bulk-upgrader-skin.php

@@ -16 +16 @@
  * @see WP_Upgrader_Skin
  */
 class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
+
+
+
+
+
         public $in_loop = false;
+
         /**
+
+
          * @var string|false
          */
         public $error = false;
 
         /**
-         * @param array $args
+         * @param array $args
          */
         public function __construct( $args = array() ) {
                 $defaults = array(
@@ -36 +44 @@
         }
 
         /**
+
+
+
          */
         public function add_strings() {
                 $this->upgrader->strings['skin_upgrade_start'] = __( 'The update process is starting. This process may take a while on some hosts, so please be patient.' );
@@ -46 +57 @@
                 /* translators: %s: Title of an update */
                 $this->upgrader->strings['skin_update_successful'] = __( '%s updated successfully.' );
                 $this->upgrader->strings['skin_upgrade_end']       = __( 'All updates have been completed.' );
+
+
         }
 
         /**
-         * @param string $string
+         * Outputs feedback.
+         *
+         * @param string $string Text to show.
+         *
+         * @return void
          */
         public function feedback( $string ) {
+
+
                 if ( isset( $this->upgrader->strings[ $string ] ) ) {
                         $string = $this->upgrader->strings[ $string ];
                 }
@@ -65 +84 @@
                                 $string = vsprintf( $string, $args );
                         }
                 }
+
                 if ( empty( $string ) ) {
                         return;
                 }
-                if ( $this->in_loop ) {
-                        echo "$string<br />\n";
+
+                if ( $original_string === 'maintenance_start' ) {
+                        printf( '<p class="update-maintenance-start"><strong>%s</strong></p><div class="update-maintenance-content">', $string );
+                } elseif( $original_string === 'maintenance_end' ) {
+                        printf( '</div><p class="update-maintenance-end"><strong>%s</strong></p>', $string );
                 } else {
-                        echo "<p>$string</p>\n";
+                        if ( $this->in_loop ) {
+                                $string = "$string<br/>";
+                        } else {
+                                $string = "<p>$string</p>";
+                        }
+
+                        echo "$string\n";
                 }
+
+
         }
 
         /**
+
+
+
          */
         public function header() {
                 // Nothing, This will be displayed within a iframe.
         }
 
         /**
+
+
+
          */
         public function footer() {
                 // Nothing, This will be displayed within a iframe.
         }
 
         /**
-         * @param string|WP_Error $error
+         * Showns an error.
+         *
+         * @param string|WP_Error $error Error that will be shown.
          */
         public function error( $error ) {
                 if ( is_string( $error ) && isset( $this->upgrader->strings[ $error ] ) ) {
@@ -110 +149 @@
         }
 
         /**
+
+
+
          */
         public function bulk_header() {
                 $this->feedback( 'skin_upgrade_start' );
         }
 
         /**
+
+
+
          */
         public function bulk_footer() {
                 $this->feedback( 'skin_upgrade_end' );
         }
 
         /**
-         * @param string $title
+         * Shows an header for an element.
+         * side-effect: Flushes the output buffer
+         *
+         * @param string $title Copy or string identifier to use.
+         *
+         * @return void
          */
         public function before( $title = '' ) {
                 $this->in_loop = true;
-                printf( '<h2>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h2>', $title, $this->upgrader->update_current, $this->upgrader->update_count );
-                echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').css("display", "inline-block");</script>';
+
+                $format = $this->upgrader->strings['skin_before_update_header'];
+
+                $identifier = $this->upgrader->update_current;
+                if ( isset( $this->upgrader->strings[ $title ] ) ) {
+                        $identifier = $title;
+                        $format = $this->upgrader->strings[ $title ];
+                }
+
+                printf(
+                        '<h2>' . $format . ' <span class="' . esc_attr( 'spinner waiting-' . $identifier ) . '"></span></h2>',
+                        $title,
+                        $this->upgrader->update_current,
+                        $this->upgrader->update_count
+                );
+
+                echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $identifier ) . '\').css("display", "inline-block");</script>';
                 // This progress messages div gets moved via JavaScript when clicking on "Show details.".
-                echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr( $this->upgrader->update_current ) . '"><p>';
+                echo '<div class="update-messages hide-if-js" id=" ) . '"><p>';
                 $this->flush_output();
         }
 
         /**
-         * @param string $title
+         * Shows a footer for an element.
+         * side-effect: Flushes the output buffer
+         *
+         * @param string $title Copy or string identifier to use.
+         *
+         * @return void
          */
         public function after( $title = '' ) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 echo '</p></div>';
+
                 if ( $this->error || ! $this->result ) {
                         if ( $this->error ) {
-                                echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed_error'], $title, '<strong>' . $this->error . '</strong>' ) . '</p></div>';
+                                echo '<div class="error"><p>' . sprintf( $, $title, '<strong>' . $this->error . '</strong>' ) . '</p></div>';
                         } else {
-                                echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed'], $title ) . '</p></div>';
+                                echo '<div class="error"><p>' . sprintf( $, $title ) . '</p></div>';
                         }
 
-                        echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js( $this->upgrader->update_current ) . '\').show();</script>';
+                        echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js( $ ) . '\').show();</script>';
                 }
+
                 if ( $this->result && ! is_wp_error( $this->result ) ) {
                         if ( ! $this->error ) {
-                                echo '<div class="updated js-update-details" data-update-details="progress-' . esc_attr( $this->upgrader->update_current ) . '">' .
-                                        '<p>' . sprintf( $this->upgrader->strings['skin_update_successful'], $title ) .
+                                echo '<div class="updated js-update-details" data-update-details=" ) . '">' .
+                                        '<p>' . sprintf( $, $title ) .
                                         ' <button type="button" class="hide-if-no-js button-link js-update-details-toggle" aria-expanded="false">' . __( 'Show details.' ) . '</button>' .
                                         '</p></div>';
                         }
@@ -163 +249 @@
         }
 
         /**
+
+
+
          */
         public function reset() {
                 $this->in_loop = false;
@@ -170 +259 @@
         }
 
         /**
+
+
+
          */
         public function flush_output() {
                 wp_ob_end_flush_all();

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

@@ -32 +32 @@
                 /* translators: %s: package URL */
                 $this->strings['downloading_package']   = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
                 $this->strings['unpack_package']        = __( 'Unpacking the update&#8230;' );
+
                 $this->strings['copy_failed']           = __( 'Could not copy files.' );
                 $this->strings['copy_failed_space']     = __( 'Could not copy files. You may have run out of disk space.' );
                 $this->strings['start_rollback']        = __( 'Attempting to roll back to previous version.' );

new file src/wp-admin/includes/class-plugin-bulk-upgrade-element.php

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

new file src/wp-admin/includes/class-plugin-bulk-upgrader.php

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -49 +49 @@
                 /* translators: %s: package URL */
                 $this->strings['downloading_package']  = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
                 $this->strings['unpack_package']       = __( 'Unpacking the update&#8230;' );
+
                 $this->strings['remove_old']           = __( 'Removing the old version of the plugin&#8230;' );
                 $this->strings['remove_old_failed']    = __( 'Could not remove the old plugin.' );
                 $this->strings['process_failed']       = __( 'Plugin update failed.' );
@@ -66 +67 @@
                 /* translators: %s: package URL */
                 $this->strings['downloading_package'] = sprintf( __( 'Downloading installation package from %s&#8230;' ), '<span class="code">%s</span>' );
                 $this->strings['unpack_package']      = __( 'Unpacking the package&#8230;' );
+
                 $this->strings['installing_package']  = __( 'Installing the plugin&#8230;' );
                 $this->strings['no_files']            = __( 'The plugin contains no files.' );
                 $this->strings['process_failed']      = __( 'Plugin installation failed.' );
@@ -228 +230 @@
                 $this->bulk = true;
                 $this->upgrade_strings();
 
-                $current = get_site_transient( 'update_plugins' );
-
                 add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ), 10, 4 );
 
                 $this->skin->header();
@@ -243 +243 @@
 
                 $this->skin->bulk_header();
 
-                /*
-                 * Only start maintenance mode if:
-                 * - running Multisite and there are one or more plugins specified, OR
-                 * - a plugin with an update available is currently active.
-                 * @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
-                 */
-                $maintenance = ( is_multisite() && ! empty( $plugins ) );
-                foreach ( $plugins as $plugin ) {
-                        $maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin ] ) );
-                }
-                if ( $maintenance ) {
-                        $this->maintenance_mode( true );
-                }
-
-                $results = array();
-
-                $this->update_count   = count( $plugins );
-                $this->update_current = 0;
-                foreach ( $plugins as $plugin ) {
-                        $this->update_current++;
-                        $this->skin->plugin_info = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin, false, true );
-
-                        if ( ! isset( $current->response[ $plugin ] ) ) {
-                                $this->skin->set_result( 'up_to_date' );
-                                $this->skin->before();
-                                $this->skin->feedback( 'up_to_date' );
-                                $this->skin->after();
-                                $results[ $plugin ] = true;
-                                continue;
-                        }
-
-                        // Get the URL to the zip file.
-                        $r = $current->response[ $plugin ];
-
-                        $this->skin->plugin_active = is_plugin_active( $plugin );
-
-                        $result = $this->run(
-                                array(
-                                        'package'           => $r->package,
-                                        'destination'       => WP_PLUGIN_DIR,
-                                        'clear_destination' => true,
-                                        'clear_working'     => true,
-                                        'is_multi'          => true,
-                                        'hook_extra'        => array(
-                                                'plugin' => $plugin,
-                                        ),
-                                )
-                        );
-
-                        $results[ $plugin ] = $this->result;
-
-                        // Prevent credentials auth screen from displaying multiple times
-                        if ( false === $result ) {
-                                break;
-                        }
-                } //end foreach $plugins
-
-                $this->maintenance_mode( false );
+                $plugin_bulk_upgrader = new WP_Plugin_Bulk_Upgrader( $this, $plugins );
+                $results = $plugin_bulk_upgrader->run();
 
                 // Force refresh of plugin update information.
                 wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );

new file src/wp-admin/includes/class-theme-bulk-upgrade-element.php

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

new file src/wp-admin/includes/class-theme-bulk-upgrader.php

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -48 +48 @@
                 /* translators: %s: package URL */
                 $this->strings['downloading_package'] = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
                 $this->strings['unpack_package']      = __( 'Unpacking the update&#8230;' );
+
                 $this->strings['remove_old']          = __( 'Removing the old version of the theme&#8230;' );
                 $this->strings['remove_old_failed']   = __( 'Could not remove the old theme.' );
                 $this->strings['process_failed']      = __( 'Theme update failed.' );
@@ -64 +65 @@
                 /* translators: %s: package URL */
                 $this->strings['downloading_package'] = sprintf( __( 'Downloading installation package from %s&#8230;' ), '<span class="code">%s</span>' );
                 $this->strings['unpack_package']      = __( 'Unpacking the package&#8230;' );
+
                 $this->strings['installing_package']  = __( 'Installing the theme&#8230;' );
                 $this->strings['no_files']            = __( 'The theme contains no files.' );
                 $this->strings['process_failed']      = __( 'Theme installation failed.' );
@@ -358 +360 @@
 
                 $this->skin->bulk_header();
 
-                // Only start maintenance mode if:
-                // - running Multisite and there are one or more themes specified, OR
-                // - a theme with an update available is currently in use.
-                // @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
-                $maintenance = ( is_multisite() && ! empty( $themes ) );
-                foreach ( $themes as $theme ) {
-                        $maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template();
-                }
-                if ( $maintenance ) {
-                        $this->maintenance_mode( true );
-                }
-
-                $results = array();
-
-                $this->update_count   = count( $themes );
-                $this->update_current = 0;
-                foreach ( $themes as $theme ) {
-                        $this->update_current++;
-
-                        $this->skin->theme_info = $this->theme_info( $theme );
-
-                        if ( ! isset( $current->response[ $theme ] ) ) {
-                                $this->skin->set_result( true );
-                                $this->skin->before();
-                                $this->skin->feedback( 'up_to_date' );
-                                $this->skin->after();
-                                $results[ $theme ] = true;
-                                continue;
-                        }
-
-                        // Get the URL to the zip file
-                        $r = $current->response[ $theme ];
-
-                        $result = $this->run(
-                                array(
-                                        'package'           => $r['package'],
-                                        'destination'       => get_theme_root( $theme ),
-                                        'clear_destination' => true,
-                                        'clear_working'     => true,
-                                        'is_multi'          => true,
-                                        'hook_extra'        => array(
-                                                'theme' => $theme,
-                                        ),
-                                )
-                        );
-
-                        $results[ $theme ] = $this->result;
-
-                        // Prevent credentials auth screen from displaying multiple times
-                        if ( false === $result ) {
-                                break;
-                        }
-                } //end foreach $plugins
-
-                $this->maintenance_mode( false );
+                $theme_bulk_upgrader = new WP_Theme_Bulk_Upgrader( $this, $themes );
+                $results = $theme_bulk_upgrader->run();
 
                 // Refresh the Theme Update information
                 wp_clean_themes_cache( $parsed_args['clear_update_cache'] );

new file src/wp-admin/includes/class-wp-upgrader-bulk.php

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -15 +15 @@
  */
 class WP_Upgrader_Skin {
 
+
+
+
+
+
         public $upgrader;
         public $done_header = false;
         public $done_footer = false;
@@ -42 +47 @@
         }
 
         /**
-         * @param WP_Upgrader $upgrader
+         * Sets the upgrader to use internally.
+         *
+         * @param WP_Upgrader $upgrader Upgrader to use.
          */
         public function set_upgrader( &$upgrader ) {
                 if ( is_object( $upgrader ) ) {

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

@@ -9 +9 @@
  * @since 2.8.0
  */
 
+
+
+
 /** WP_Upgrader_Skin class */
 require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader-skin.php';
 
@@ -64 +67 @@
          * @since 2.8.0
          * @var Automatic_Upgrader_Skin|WP_Upgrader_Skin $skin
          */
-        public $skin = null;
+        public $skin;
 
         /**
          * The result of the installation.
@@ -120 +123 @@
          *                               instance.
          */
         public function __construct( $skin = null ) {
-                if ( null == $skin ) {
+                if (  ) {
                         $this->skin = new WP_Upgrader_Skin();
                 } else {
                         $this->skin = $skin;
@@ -300 +303 @@
         public function unpack_package( $package, $delete_package = true ) {
                 global $wp_filesystem;
 
-                $this->skin->feedback( 'unpack_package' );
+                if ( $this->update_count > 1 ) {
+                        $this->skin->feedback( 'unpack_package_bulk', $this->update_current, $this->update_count );
+                } else {
+                        $this->skin->feedback( 'unpack_package' );
+                }
 
                 $upgrade_folder = $wp_filesystem->wp_content_dir() . 'upgrade/';
 
-                //Clean up contents of upgrade directory beforehand.
-                $upgrade_files = $wp_filesystem->dirlist( $upgrade_folder );
-                if ( ! empty( $upgrade_files ) ) {
-                        foreach ( $upgrade_files as $file ) {
-                                $wp_filesystem->delete( $upgrade_folder . $file['name'], true );
-                        }
-                }
-
                 // We need a working directory - Strip off any .tmp or .zip suffixes
                 $working_dir = $upgrade_folder . basename( basename( $package, '.tmp' ), '.zip' );
 
@@ -702 +701 @@
                  */
                 $options = apply_filters( 'upgrader_package_options', $options );
 
-                if ( ! $options['is_multi'] ) { // call $this->header separately if running multiple times
-                        $this->skin->header();
-                }
+                $this->skin->header();
 
                 // Connect to the Filesystem first.
                 $res = $this->fs_connect( array( WP_CONTENT_DIR, $options['destination'] ) );
@@ -727 +724 @@
                         return $res;
                 }
 
+
+
                 /*
                  * Download the package (Note, This just returns the filename
                  * of the file if the package is a local file)
@@ -925 +924 @@
                 return delete_option( $lock_name . '.lock' );
         }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
 /** Plugin_Upgrader class */