From 113a9d45172875748b26b341ebd5b43c7a32dfd6 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Thu, 1 Oct 2015 20:25:26 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@34748


git-svn-id: http://core.svn.wordpress.org/trunk@34713 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-upgrader.php | 13 +++++++++----
 wp-includes/version.php                 |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index 65cbab4072..89f966cd60 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -1867,9 +1867,14 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 			return;
 		}
 
-		$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 );
 		$lp_upgrader->bulk_upgrade( $language_updates );
@@ -3368,7 +3373,7 @@ class WP_Automatic_Updater {
 
 		// 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
 			 * plugin, theme, and translation updates.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6486c5ac26..6910bd9b7b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34747';
+$wp_version = '4.4-alpha-34748';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.