Avoid a warning if the translations API call fails on step 1. Remove assignment inside an if statement. See #28577.
git-svn-id: https://develop.svn.wordpress.org/trunk@28982 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
71704c1156
commit
35578f8f9a
|
@ -200,7 +200,8 @@ if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) {
|
||||||
|
|
||||||
switch($step) {
|
switch($step) {
|
||||||
case 0: // Step 0
|
case 0: // Step 0
|
||||||
if ( $body = wp_get_available_translations() ) {
|
$body = wp_get_available_translations();
|
||||||
|
if ( $body ) {
|
||||||
display_header( 'language-chooser' );
|
display_header( 'language-chooser' );
|
||||||
|
|
||||||
echo '<form id="setup" method="post" action="install.php?step=1">';
|
echo '<form id="setup" method="post" action="install.php?step=1">';
|
||||||
|
@ -219,12 +220,15 @@ switch($step) {
|
||||||
case 1: // Step 1, direct link or from language chooser.
|
case 1: // Step 1, direct link or from language chooser.
|
||||||
if ( ! empty( $_POST['language'] ) ) {
|
if ( ! empty( $_POST['language'] ) ) {
|
||||||
$body = wp_get_available_translations();
|
$body = wp_get_available_translations();
|
||||||
|
$loading_language = false;
|
||||||
|
if ( $body ) {
|
||||||
foreach ( $body['languages'] as $language ) {
|
foreach ( $body['languages'] as $language ) {
|
||||||
if ( $language['language'] === $_POST['language'] ) {
|
if ( $language['language'] === $_POST['language'] ) {
|
||||||
$loading_language = $_POST['language'];
|
$loading_language = $_POST['language'];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if ( ! empty( $loading_language ) ) {
|
if ( ! empty( $loading_language ) ) {
|
||||||
require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
|
require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
|
||||||
$skin = new Automatic_Upgrader_Skin;
|
$skin = new Automatic_Upgrader_Skin;
|
||||||
|
|
Loading…
Reference in New Issue