Changeset 40486

Timestamp:

04/20/2017 12:26:30 AM (9 years ago)

Author:

flixos90

Message:

Multisite: Add $network_id parameter to wp_update_network_counts().

After the $network_id parameter has been introduced for wp_update_network_site_counts() in [40484] and wp_update_network_user_counts() in [40485], the new parameter can now also be used on the wrapping function.

Fixes #40386. 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

@@ -2275 +2275 @@
  *
  * @since 3.1.0
- */
-function wp_update_network_counts() {
-        wp_update_network_user_counts();
-        wp_update_network_site_counts();
+ * @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_counts( $network_id = null ) {
+        wp_update_network_user_counts( $network_id );
+        wp_update_network_site_counts( $network_id );
 }
 

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

@@ -441 +441 @@
                 $this->assertEquals( $expected, $result );
         }
+
+        /**
+         * @ticket 40386
+         */
+        public function test_wp_update_network_counts() {
+                delete_network_option( null, 'site_count' );
+                delete_network_option( null, 'user_count' );
+
+                wp_update_network_counts();
+
+                $site_count = (int) get_blog_count();
+                $user_count = (int) get_user_count();
+
+                $this->assertTrue( $site_count > 0 && $user_count > 0 );
+        }
+
+        /**
+         * @ticket 40386
+         */
+        public function test_wp_update_network_counts_on_different_network() {
+                delete_network_option( self::$different_network_id, 'site_count' );
+                delete_network_option( self::$different_network_id, 'user_count' );
+
+                wp_update_network_counts( self::$different_network_id );
+
+                $site_count = (int) get_blog_count( self::$different_network_id );
+                $user_count = (int) get_user_count( self::$different_network_id );
+
+                $this->assertTrue( $site_count > 0 && $user_count > 0 );
+        }
 }