Ticket #40349: 40349.diff

src/wp-includes/ms-functions.php

@@ -2346 +2346 @@
  * Update the network-wide user count.
  *
  * @since 3.7.0
+ * @since 4.8.0 The $network_id parameter has been added.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param int|null $network_id ID of the network. Default is the current network.
  */
-function wp_update_network_user_counts() {
+function wp_update_network_user_counts( $network_id = null ) {
         global $wpdb;
 
         $count = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
-        update_site_option( 'user_count', $count );
+        update_network_option( $network_id, 'user_count', $count );
 }
 
 /**

tests/phpunit/tests/multisite/network.php

@@ -235 +235 @@
         }
 
         /**
+         * @ticket 40349
+         */
+        public function test_wp_update_network_user_counts_on_different_network() {
+                wp_update_network_user_counts();
+                $expected = get_user_count();
+
+                wp_update_network_user_counts( self::$different_network_id );
+                $actual = get_user_count( self::$different_network_id );
+
+                $this->assertEquals( $expected, $actual );
+        }
+
+        /**
          * @ticket 22917
          */
         function test_enable_live_network_user_counts_filter() {