Changeset 40485

Timestamp:

04/20/2017 12:13:41 AM (7 years ago)

Author:

flixos90

Message:

Multisite: Add $network_id parameter to wp_update_network_user_counts().

Using the new parameter, it is now possible to update the user count on a network different from the current one. While the count itself is technically a global user count and not network-wide, it is stored on each individual network, and the new parameter provides more control about where to update the count.

Fixes #40349. See #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

@@ -2355 +2355 @@
  *
  * @since 3.7.0
+ * @since 4.8.0 The $network_id parameter has been added.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
- */
-function wp_update_network_user_counts() {
+ *
+ * @param int|null $network_id ID of the network. Default is the current network.
+ */
+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 );
 }
 

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

@@ -409 +409 @@
         $this->assertEquals( 3, $result );
     }
+
+    /**
+     * @ticket 40349
+     */
+    public function test_wp_update_network_user_counts() {
+        global $wpdb;
+
+        update_network_option( null, 'user_count', 40 );
+
+        $expected = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
+
+        wp_update_network_user_counts();
+
+        $result = get_user_count();
+        $this->assertEquals( $expected, $result );
+    }
+
+    /**
+     * @ticket 40349
+     */
+    public function test_wp_update_network_user_counts_on_different_network() {
+        global $wpdb;
+
+        update_network_option( self::$different_network_id, 'user_count', 40 );
+
+        $expected = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
+
+        wp_update_network_user_counts( self::$different_network_id );
+
+        $result = get_user_count( self::$different_network_id );
+        $this->assertEquals( $expected, $result );
+    }
 }