Ticket #22917: 22917.5.diff

src/wp-admin/includes/ms.php

@@ -146 +146 @@
                 }
 
                 clean_blog_cache( $blog );
+
+                //duplicate hook
+                if ( apply_filters( 'enable_live_network_counts', ! wp_is_large_network( 'sites' ), 'sites' ) )
+                        wp_update_network_site_counts();
         }
 
         if ( $switch )
@@ -202 +206 @@
 
         clean_user_cache( $user );
 
+        //duplicate hook
+        if ( apply_filters( 'enable_live_network_counts', ! wp_is_large_network( 'users' ), 'users' ) )
+                wp_update_network_user_counts();
+
         /**
          * Fires after the user is deleted from the network.
          *

src/wp-includes/ms-functions.php

@@ -908 +908 @@
 
         do_action( 'wpmu_new_user', $user_id );
 
+        /**
+         * Filter the decision to update network user and site counts in real time.
+         *
+         * @since 3.7.0
+         *
+         * @param bool   null Opposite of wp_is_large_network() result. Depending on context,
+         *                    either 'users' or 'sites' will be passed to wp_is_large_network().
+         * @param string null Context. Either 'users' or 'sites'.
+         */
+        if ( apply_filters( 'enable_live_network_counts', ! wp_is_large_network( 'users' ), 'users' ) )
+                wp_update_network_user_counts();
+
         return $user_id;
 }
 
@@ -1140 +1152 @@
         populate_roles();
         $wp_roles->_init();
 
+        //duplicate hook
+        if ( apply_filters( 'enable_live_network_counts', ! wp_is_large_network( 'sites' ), 'sites' ) )
+                wp_update_network_site_counts();
+
         $url = untrailingslashit( $url );
 
         update_option( 'siteurl', $url );
@@ -1874 +1890 @@
  *  Update the network-wide counts for the current network.
  *
  *  @since 3.1.0
+ *
+ *  @uses wp_update_network_user_counts()
+ *  @uses wp_update_network_site_counts()
  */
 function wp_update_network_counts() {
+        wp_update_network_user_counts();
+        wp_update_network_site_counts();
+}
+
+/**
+ * Update the network-wide user count.
+ *
+ * @since 3.7.0
+ */
+function wp_update_network_user_counts() {
         global $wpdb;
 
-        $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $wpdb->siteid) );
-        update_site_option( 'blog_count', $count );
-
         $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 the network-wide site count.
+ *
+ * @since 3.7.0
+ */
+function wp_update_network_site_counts() {
+        global $wpdb;
+
+        $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $wpdb->siteid ) );
+        update_site_option( 'blog_count', $count );
+}
+
+/**
  * Returns the space used by the current blog.
  *
  * @since 3.5.0

tests/phpunit/tests/ms.php

@@ -16 +16 @@
                 $_SERVER['REMOTE_ADDR'] = '';
         }
 
+        /**
+         * @ticket 22917
+         */
+        function test_enable_live_network_site_counts_filter() {
+                $site_count_start = get_blog_count();
+                add_filter( 'enable_live_network_counts', __return_false ); //false by default as of 3.7
+                $this->factory->blog->create_many( 4 );
+
+                $this->assertEquals( $site_count_start, (int) get_blog_count() ); //count only updated when cron runs, so likely unchanged
+                
+                add_filter( 'enable_live_network_counts', __return_true ); //turns on live updating
+                $site_ids = $this->factory->blog->create_many( 4 );
+
+                $this->assertEquals( $site_count_start + 9, (int) get_blog_count() ); //count should be updated
+
+                //clean up
+                remove_filter( 'enable_live_network_counts', __return_false );
+                remove_filter( 'enable_live_network_counts', __return_true );
+                foreach ( $site_ids as $site_id ) {
+                        wpmu_delete_blog( $site_id, true );
+                }
+        }
+
+        /**
+         * @ticket 22917
+         */
+        function test_enable_live_network_user_counts_filter() {
+                add_filter( 'enable_live_network_counts', __return_false ); //false by default as of 3.7
+
+                // Refresh the cache
+                wp_update_network_counts();
+                $start_count = get_user_count();
+
+                wpmu_create_user( 'user', 'pass', 'email' );
+
+                $count = get_user_count(); // No change, cache not refreshed
+
+                $this->assertEquals( $start_count, $count );
+                
+                //start over with filter on
+                wp_update_network_counts();
+                $start_count = get_user_count();
+
+                add_filter( 'enable_live_network_counts', __return_true ); //turns on live updating
+                
+                wpmu_create_user( 'user2', 'pass2', 'email2' );
+
+                $count = get_user_count();
+                $this->assertEquals( $start_count + 1, $count );
+
+                //turn filter back off
+                remove_filter( 'enable_live_network_counts', __return_false );
+                remove_filter( 'enable_live_network_counts', __return_true );
+        }
+
         function test_create_and_delete_blog() {
                 global $wpdb;