Ticket #46351: 46351.diff

src/wp-includes/ms-site.php

@@ -95 +95 @@
                 $user_id = ! empty( $args['user_id'] ) ? $args['user_id'] : 0;
                 $meta    = ! empty( $args['options'] ) ? $args['options'] : array();
 
+                // Restore WPLANG which used to be part of the meta prior 5.1.0.
+                if ( ! array_key_exists( 'WPLANG', $meta ) ) {
+                        $meta['WPLANG'] = get_network_option( $new_site->network_id, 'WPLANG' );
+                }
+
+                // Restore site status which used to be part of the meta prior 5.1.0.
+                // The `$site_data_whitelist` matches the one used in `wpmu_create_blog`.
+                $site_data_whitelist = array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
+                $meta = array_merge( array_intersect_key( $data, array_flip( $site_data_whitelist ) ), $meta );
+
                 /**
                  * Fires immediately after a new site is created.
                  *

tests/phpunit/tests/multisite/site.php

@@ -2348 +2348 @@
                         // Set siteurl
                         update_option( 'siteurl', 'http://testsite1.example.org/test' );
                 }
+
+                /**
+                 * @ticket 46351
+                 */
+                public function test_wpmu_new_blog_action_backward_compatible() {
+                        // We are testing deprecated hook. Register it to expected deprecated notices.
+                        $this->setExpectedDeprecated( 'wpmu_new_blog' );
+                        add_action( 'wpmu_new_blog', array( $this, 'wpmu_new_blog_callback' ), 10, 6 );
+
+                        $meta = array(
+                                'public'  => -1, // `public` is one of the defaults metas in `wpmu_create_blog' function prior WordPress 5.1.0.
+                                'lang_id' => 11,
+                                'mature'  => 0,
+                        );
+                        $blog_id = wpmu_create_blog( 'testsite1.example.org', '/new-blog/', 'New Blog', get_current_user_id(), $meta, 1 );
+
+                        remove_action( 'populate_options', array( $this, 'wpmu_new_blog_callback' ), 10 );
+                }
+
+                /**
+                 * Capture the $meta value passed to the wpmu_new_blog action and compare it.
+                 */
+                public function wpmu_new_blog_callback( $blog_id, $user_id, $domain, $path, $network_id, $meta ) {
+                        $expected_meta = array(
+                                'public'   => -1,
+                                'WPLANG'   => 'en_US', // WPLANG is another default meta in `wpmu_create_blog` function prior WordPress 5.1.0.
+                                'lang_id'  => 11,
+                                'mature'   => 0,
+                        );
+                        $this->assertArraySubset( $expected_meta, $meta );
+                }
         }
 
 endif;