Ticket #22917: 22917.2.diff

Index: wp-includes/ms-functions.php
===================================================================
--- wp-includes/ms-functions.php        (revision 23693)
+++ wp-includes/ms-functions.php        (working copy)
@@ -909,6 +909,8 @@
        delete_user_option( $user_id, 'user_level' );
 
        do_action( 'wpmu_new_user', $user_id );
+       if ( apply_filters( 'enable_live_network_user_counts', false ) )
+               wp_update_network_user_counts(); // user added, update network counts
 
        return $user_id;
 }
@@ -1138,6 +1140,8 @@
        populate_options();
        populate_roles();
        $wp_roles->_init();
+       if ( apply_filters( 'enable_live_network_blog_counts', false ) )
+               wp_update_network_blog_counts(); // new blog added, update network counts
 
        $url = untrailingslashit( $url );
 
@@ -1887,16 +1891,35 @@
  *  @since 3.1.0
  */
 function wp_update_network_counts() {
+       wp_update_network_user_counts();
+       wp_update_network_blog_counts();
+}
+
+/**
+ * Update the network-wide counts for users.
+ *
+ * @since 3.6.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 counts for blogs.
+ *
+ * @since 3.6.0
+ */
+function wp_update_network_blog_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
Index: wp-admin/includes/ms.php
===================================================================
--- wp-admin/includes/ms.php    (revision 23693)
+++ wp-admin/includes/ms.php    (working copy)
@@ -122,6 +122,8 @@
                }
 
                clean_blog_cache( $blog );
+               if ( apply_filters( 'enable_live_network_blog_counts', false ) )
+                       wp_update_network_blog_counts(); // blog deleted, update network counts
        }
 
        if ( $switch )
@@ -171,6 +173,8 @@
        $wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
 
        clean_user_cache( $user );
+       if ( apply_filters( 'enable_live_network_user_counts', false ) )
+               wp_update_network_user_counts(); // user deleted, update network counts
 
        // allow for commit transaction
        do_action( 'deleted_user', $id );