Changeset 40484

Timestamp:

04/19/2017 11:59:16 PM (7 years ago)

Author:

flixos90

Message:

Multisite: Add $network_id parameter to wp_update_network_site_counts().

Using the new parameter, it is now possible to update the site counts on a network different from the current network.

Props PieWP, johnjamesjacoby.
Fixes #37528. See #38699.

Location:

trunk

Files:

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

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

@@ -2330 +2330 @@
  *
  * @since 3.7.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- */
-function wp_update_network_site_counts() {
-    global $wpdb;
+ * @since 4.8.0 The $network_id parameter has been added.
+ *
+ * @param int|null $network_id ID of the network. Default is the current network.
+ */
+function wp_update_network_site_counts( $network_id = null ) {
+    $network_id = (int) $network_id;
+    if ( ! $network_id ) {
+        $network_id = get_current_network_id();
+    }
 
     $count = get_sites( array(
-        'network_id' => $wpdb->siteid,
+        'network_id' => $network_id,
         'spam'       => 0,
         'deleted'    => 0,
@@ -2344 +2348 @@
     ) );
 
-    update_site_option( 'blog_count', $count );
+    update_network_option( $network_id, 'blog_count', $count );
 }
 

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

@@ -377 +377 @@
         $this->assertEquals( $blog_id, $dashboard_blog->blog_id );
     }
+
+    /**
+     * @ticket 37528
+     */
+    function test_wp_update_network_site_counts() {
+        update_network_option( null, 'blog_count', 40 );
+
+        $expected = get_sites( array(
+            'network_id' => get_current_network_id(),
+            'spam'       => 0,
+            'deleted'    => 0,
+            'archived'   => 0,
+            'count'      => true,
+        ) );
+
+        wp_update_network_site_counts();
+
+        $result = get_blog_count();
+        $this->assertEquals( $expected, $result );
+    }
+
+    /**
+     * @ticket 37528
+     */
+    function test_wp_update_network_site_counts_on_different_network() {
+        update_network_option( self::$different_network_id, 'blog_count', 40 );
+
+        wp_update_network_site_counts( self::$different_network_id );
+
+        $result = get_blog_count( self::$different_network_id );
+        $this->assertEquals( 3, $result );
+    }
 }