Changeset 38655

Timestamp:

09/26/2016 06:38:32 PM (8 years ago)

Author:

ocean90

Message:

Multisite: Allow to set the site language of a new site to English.

An empty string in WPLANG is used to define the site language as en_US. The ! empty() check didn't catch this case so that wpmu_create_blog() fell back to the network setting.

Fixes #36918.

Location:

trunk

Files:

• src/wp-admin/network/site-new.php (modified) (1 diff)
• src/wp-includes/ms-functions.php (modified) (2 diffs)
• tests/phpunit/tests/multisite/site.php (modified) (1 diff)

trunk/src/wp-admin/network/site-new.php

@@ -66 +66 @@
 
     // Handle translation install for the new site.
-    if ( ! empty( $_POST['WPLANG'] ) && wp_can_install_language_pack() ) {
-        $language = wp_download_language_pack( wp_unslash( $_POST['WPLANG'] ) );
-        if ( $language ) {
-            $meta['WPLANG'] = $language;
+    if ( isset( $_POST['WPLANG'] ) ) {
+        if ( '' === $_POST['WPLANG'] ) {
+            $meta['WPLANG'] = ''; // en_US
+        } elseif ( wp_can_install_language_pack() ) {
+            $language = wp_download_language_pack( wp_unslash( $_POST['WPLANG'] ) );
+            if ( $language ) {
+                $meta['WPLANG'] = $language;
+            }
         }
     }

trunk/src/wp-includes/ms-functions.php

@@ -1093 +1093 @@
  */
 function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $site_id = 1 ) {
-    $defaults = array( 'public' => 0 );
+    $defaults = array(
+        'public' => 0,
+        'WPLANG' => get_site_option( 'WPLANG' ),
+    );
     $meta = wp_parse_args( $meta, $defaults );
 
@@ -1131 +1134 @@
     }
 
-    add_option( 'WPLANG', get_site_option( 'WPLANG' ) );
     update_option( 'blog_public', (int) $meta['public'] );
 

trunk/tests/phpunit/tests/multisite/site.php

@@ -927 +927 @@
     }
 
+    /**
+     * @ticket 36918
+     */
+    function test_new_blog_locale() {
+        $current_site = get_current_site();
+
+        add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
+        update_site_option( 'WPLANG', 'de_DE' );
+        remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
+
+        // No locale, use default locale.
+        add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
+        $blog_id = wpmu_create_blog( $current_site->domain, '/de-de/', 'New Blog', get_current_user_id() );
+        remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
+
+        $this->assertNotWPError( $blog_id );
+        $this->assertSame( 'de_DE', get_blog_option( $blog_id, 'WPLANG' ) );
+
+        // Custom locale.
+        add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
+        $blog_id = wpmu_create_blog( $current_site->domain, '/es-es/', 'New Blog', get_current_user_id(), array( 'WPLANG' => 'es_ES' ) );
+        remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
+
+        $this->assertNotWPError( $blog_id );
+        $this->assertSame( 'es_ES', get_blog_option( $blog_id, 'WPLANG' ) );
+
+        // en_US locale.
+        add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
+        $blog_id = wpmu_create_blog( $current_site->domain, '/en-us/', 'New Blog', get_current_user_id(), array( 'WPLANG' => '' ) );
+        remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
+
+        $this->assertNotWPError( $blog_id );
+        $this->assertSame( '', get_blog_option( $blog_id, 'WPLANG' ) );
+    }
+
+    /**
+     * Allows to set the WPLANG option to any language.
+     *
+     * @param string $value          The sanitized option value.
+     * @param string $option         The option name.
+     * @param string $original_value The original value passed to the function.
+     * @return string The orginal value.
+     */
+    function filter_allow_unavailable_languages( $value, $option, $original_value ) {
+        return $original_value;
+    }
 }