Changeset 34748

Timestamp:

10/01/2015 08:24:18 PM (9 years ago)

Author:

ocean90

Message:

Language Upgrader: Re-use the automatic upgrader skin if the parent upgrader is using it.

Prevents broken Ajax responses when Language_Pack_Upgrader::async_upgrade() gets triggered during a shiny update.

Fixes #34048.

File:

• trunk/src/wp-admin/includes/class-wp-upgrader.php (modified) (2 diffs)

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

@@ -1868 +1868 @@
         }
 
-        $skin = new Language_Pack_Upgrader_Skin( array(
-            'skip_header_footer' => true,
-        ) );
+        // Re-use the automatic upgrader skin if the parent upgrader is using it.
+        if ( $upgrader && $upgrader->skin instanceof Automatic_Upgrader_Skin ) {
+            $skin = $upgrader->skin;
+        } else {
+            $skin = new Language_Pack_Upgrader_Skin( array(
+                'skip_header_footer' => true,
+            ) );
+        }
 
         $lp_upgrader = new Language_Pack_Upgrader( $skin );
@@ -3369 +3374 @@
         // Plugins, Themes, Translations
         foreach ( array( 'plugin', 'theme', 'translation' ) as $type ) {
-            
+
             /**
              * Filter to control whether a notification email is sent to the site admin email address for