Changeset 47932

Timestamp:

06/09/2020 12:39:09 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Networks and Sites: Ensure the site ID in wp_insert_site() is still correct after calling clean_blog_cache().

By saving $wpdb->insert_id to a variable, we make sure the ID does not change if another database insert is performed on the clean_site_cache action.

Props trepmal.
Fixes #50324.

Location:

trunk

Files:

• src/wp-includes/ms-site.php (modified) (1 diff)
• tests/phpunit/tests/multisite/site.php (modified) (1 diff)

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

@@ -70 +70 @@
     }
 
-    clean_blog_cache( $wpdb->insert_id );
-
-    $new_site = get_site( $wpdb->insert_id );
+    $site_id = (int) $wpdb->insert_id;
+
+    clean_blog_cache( $site_id );
+
+    $new_site = get_site( $site_id );
 
     if ( ! $new_site ) {

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

@@ -1388 +1388 @@
 
         /**
+         * @ticket 50324
+         */
+        public function test_wp_insert_site_with_clean_site_cache() {
+            remove_action( 'wp_initialize_site', 'wp_initialize_site', 10 );
+
+            add_action( 'clean_site_cache', array( $this, 'action_database_insert_on_clean_site_cache' ) );
+
+            $site_id = wp_insert_site(
+                array(
+                    'domain'     => 'valid-domain.com',
+                    'path'       => '/valid-path/',
+                    'network_id' => 1,
+                )
+            );
+
+            remove_action( 'clean_site_cache', array( $this, 'action_database_insert_on_clean_site_cache' ) );
+
+            $this->assertInternalType( 'integer', $site_id );
+
+        }
+
+        public function action_database_insert_on_clean_site_cache() {
+            update_site_option( 'database_write_test.' . time(), true );
+        }
+
+        /**
          * @ticket 40364
          */