Changeset 38655 for trunk/src/wp-includes/ms-functions.php

Timestamp:

09/26/2016 06:38:32 PM (9 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.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (2 diffs)

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'] );