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

Timestamp:

07/14/2017 09:07:17 PM (8 years ago)

Author:

flixos90

Message:

Multisite: Use get_network_option() for language in wpmu_create_blog().

Before this changeset, the language of a new site would always result in the language of the current network, regardless of the $site_id parameter passed that actually determines the network for the site. Now the correct WPLANG value is used in such cases.

Alongside this change, a few minor documentation changes around the function have been made to account for the current naming conventions of sites and networks.

Props spacedmonkey.
Fixes #40503.

File:

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

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

@@ -1153 +1153 @@
  *                        updated. Otherwise, keys and values will be used to set options for
  *                        the new site. Default empty array.
- * @param int    $site_id Optional. Only relevant on multi-network installs.
- * @return int|WP_Error Returns WP_Error object on failure, int $blog_id on success
+ * @param int    $site_id Optional. Network ID. Only relevant on multi-network installs.
+ * @return int|WP_Error Returns WP_Error object on failure, the new site ID on success.
  */
 function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $site_id = 1 ) {
     $defaults = array(
         'public' => 0,
-        'WPLANG' => get_site_option( 'WPLANG' ),
+        'WPLANG' => get_network_option( $site_id, 'WPLANG' ),
     );
     $meta = wp_parse_args( $meta, $defaults );
@@ -1209 +1209 @@
      * @since MU
      *
-     * @param int    $blog_id Blog ID.
+     * @param int    $blog_id Site ID.
      * @param int    $user_id User ID.
      * @param string $domain  Site domain.
      * @param string $path    Site path.
-     * @param int    $site_id Site ID. Only relevant on multi-network installs.
+     * @param int    $site_id Network ID. Only relevant on multi-network installs.
      * @param array  $meta    Meta data. Used to set initial site options.
      */