Changeset 40612

Timestamp:

05/10/2017 11:21:43 PM (8 years ago)

Author:

flixos90

Message:

Multisite: Adjust site count of the correct network after having created a new site.

Prior to this change, after creating a site, the network site count was always refreshed on the current network, regardless of whether the site was created on a different network. With the recent changes, particularly [40591], it is now possible to update the site count for a specific $network_id, so this changeset makes use of the new parameter.

Fixes #38699.

Location:

trunk

Files:

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

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

@@ -1376 +1376 @@
     refresh_blog_details( $blog_id );
 
-    wp_maybe_update_network_site_counts();
+    wp_maybe_update_network_site_counts( $site_id );
 
     return $blog_id;

trunk/tests/phpunit/tests/multisite/network.php

@@ -586 +586 @@
         return $is_large_network;
     }
+
+    /**
+     * @ticket 38699
+     */
+    public function test_wpmu_create_blog_updates_correct_network_site_count() {
+        $original_count = get_blog_count( self::$different_network_id );
+
+        $site_id = self::factory()->blog->create( array(
+            'domain'  => 'example.org',
+            'path'    => '/',
+            'site_id' => self::$different_network_id,
+        ) );
+
+        $result = get_blog_count( self::$different_network_id );
+
+        wpmu_delete_blog( $site_id, true );
+
+        $this->assertEquals( $original_count + 1, $result );
+    }
 }