Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrades: Specifically pass the 'version' and 'locale' POST vars through the Core Update FTP credentials form. 

This bug was introduced with [30384] / #30245
Fixes #31378 for trunk.

Built from https://develop.svn.wordpress.org/trunk@31527


git-svn-id: http://core.svn.wordpress.org/trunk@31508 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2015-02-24 03:01:25 +00:00
parent 481889c40b
commit 90e85a70c4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/update-core.php
View File

@ -392,14 +392,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;
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-alpha-31526';
$wp_version = '4.2-alpha-31527';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.