From ae731c831206264c0e6a9e18e4e83f4e532182bb Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Tue, 24 Feb 2015 03:24:25 +0000
Subject: [PATCH] Upgrades: Specifically pass the 'version' and 'locale' POST
 vars through the Core Update FTP credentials form. This bug was introduced
 with [30384] / #30245. Merges [31527] to the 4.1 branch. Fixes #31378.

Built from https://develop.svn.wordpress.org/branches/4.1@31528


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31509 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/update-core.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 0c7d297b9e..600db23eee 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -390,14 +390,14 @@ function do_core_upgrade( $reinstall = false ) {
 	<h2><?php _e('Update WordPress'); ?></h2>
 <?php
 
-	if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array(), $allow_relaxed_file_ownership ) ) ) {
+	if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ) ) ) {
 		echo '</div>';
 		return;
 	}
 
 	if ( ! WP_Filesystem( $credentials, ABSPATH, $allow_relaxed_file_ownership ) ) {
 		// Failed to connect, Error and request again
-		request_filesystem_credentials( $url, '', true, ABSPATH, array(), $allow_relaxed_file_ownership );
+		request_filesystem_credentials( $url, '', true, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership );
 		echo '</div>';
 		return;
 	}