sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix variable usage in new language install choices. see #28577.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@28779 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2014-06-19 04:36:29 +00:00
parent ae2cce3f64
commit aa6ef01298
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wp-admin/install.php
View File

@ -100,10 +100,11 @@ function display_setup_form( $error = null ) {
$sql = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->users ) ); $sql = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->users ) );
$user_table = ( $wpdb->get_var( $sql ) != null ); $user_table = ( $wpdb->get_var( $sql ) != null );
// Ensure that Blogs appear in search engines by default // Ensure that Blogs appear in search engines by default.
$blog_public = 1; $blog_public = 1;
if ( ! empty( $_POST ) ) if ( isset( $_POST['weblog_title'] ) ) {
$blog_public = isset( $_POST['blog_public'] ); $blog_public = isset( $_POST['blog_public'] );
}
$weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : ''; $weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
$user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : ''; $user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
@ -251,7 +252,7 @@ switch($step) {
$loading_language = ''; $loading_language = '';
if ( ! empty( $_POST['language'] ) ) { if ( ! empty( $_POST['language'] ) ) {
$available_languages = get_available_languages(); $available_languages = get_available_languages();
if ( isset( $available_languages[ $_POST['language'] ] ) ) { if ( in_array( $_POST['language'], $available_languages ) ) {
$loading_language = $_POST['language']; $loading_language = $_POST['language'];
load_textdomain( 'default', WP_LANG_DIR . "/{$loading_language}.mo" ); load_textdomain( 'default', WP_LANG_DIR . "/{$loading_language}.mo" );
load_textdomain( 'default', WP_LANG_DIR . "/admin-{$loading_language}.mo" ); load_textdomain( 'default', WP_LANG_DIR . "/admin-{$loading_language}.mo" );