Ticket #40503: 40503.2.diff

src/wp-includes/ms-functions.php

@@ -1152 +1152 @@
  *                        'spam', 'deleted', or 'lang_id') the given site status(es) will be
  *                        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.
+ * @param int    $network_id Optional. Only relevant on multi-network installs.
  * @return int|WP_Error Returns WP_Error object on failure, int $blog_id on success
  */
-function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $site_id = 1 ) {
+function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $network_id = 1 ) {
         $defaults = array(
                 'public' => 0,
-                'WPLANG' => get_site_option( 'WPLANG' ),
+                'WPLANG' => get_network_option( $network_id, 'WPLANG' ),
         );
         $meta = wp_parse_args( $meta, $defaults );
 
@@ -1174 +1174 @@
                 $path = '/';
 
         // Check if the domain has been used already. We should return an error message.
-        if ( domain_exists($domain, $path, $site_id) )
+        if ( domain_exists($domain, $path, $network_id) )
                 return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
 
         if ( ! wp_installing() ) {
                 wp_installing( true );
         }
 
-        if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
+        if ( ! $blog_id = insert_blog($domain, $path, $network_id) )
                 return new WP_Error('insert_blog', __('Could not create site.'));
 
         switch_to_blog($blog_id);
@@ -1212 +1212 @@
          * @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    $network_id Network ID. Only relevant on multi-network installs.
          * @param array  $meta    Meta data. Used to set initial site options.
          */
-        do_action( 'wpmu_new_blog', $blog_id, $user_id, $domain, $path, $site_id, $meta );
+        do_action( 'wpmu_new_blog', $blog_id, $user_id, $domain, $path, $network_id, $meta );
 
         wp_cache_set( 'last_changed', microtime(), 'sites' );
 

tests/phpunit/tests/multisite/site.php

@@ -10 +10 @@
  */
 class Tests_Multisite_Site extends WP_UnitTestCase {
         protected $suppress = false;
+        protected static $network_ids;
 
         function setUp() {
                 global $wpdb;
@@ -23 +24 @@
                 parent::tearDown();
         }
 
+        public static function wpSetUpBeforeClass( $factory ) {
+                self::$network_ids = array(
+                        'wordpress.org/'         => array( 'domain' => 'wordpress.org',      'path' => '/' ),
+                        'make.wordpress.org/'    => array( 'domain' => 'make.wordpress.org', 'path' => '/' ),
+                );
+
+                foreach ( self::$network_ids as &$id ) {
+                        $id = $factory->network->create( $id );
+                }
+                unset( $id );
+        }
+
+        public static function wpTearDownAfterClass() {
+                global $wpdb;
+
+                foreach( self::$network_ids as $id ) {
+                        $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", $id ) );
+                        $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->site} WHERE id= %d", $id ) );
+                }
+        }
+
         function test_switch_restore_blog() {
                 global $_wp_switched_stack, $wpdb;
 
@@ -981 +1003 @@
         }
 
         /**
+         * @ticket 40503
+         */
+        function test_different_network_language() {
+                $network = get_network( self::$network_ids['make.wordpress.org/'] );
+
+                add_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10, 3 );
+                update_network_option( self::$network_ids['make.wordpress.org/'], 'WPLANG', 'wibble' );
+                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( $network->domain, '/de-de/', 'New Blog', get_current_user_id(), array(), $network->id );
+                remove_filter( 'sanitize_option_WPLANG', array( $this, 'filter_allow_unavailable_languages' ), 10 );
+
+                $this->assertSame( get_network_option( self::$network_ids['make.wordpress.org/'], 'WPLANG' ), get_blog_option( $blog_id, 'WPLANG' ) );
+        }
+
+        /**
          * Allows to set the WPLANG option to any language.
          *
          * @param string $value          The sanitized option value.