Ticket #22917: right-now-live.diff

wp-includes/ms-functions.php

@@ -921 +921 @@
         delete_user_option( $user_id, 'user_level' );
 
         do_action( 'wpmu_new_user', $user_id );
+        wp_update_network_user_counts(); //user added, update network counts
 
         return $user_id;
 }
@@ -1149 +1150 @@
         populate_options();
         populate_roles();
         $wp_roles->_init();
+        wp_update_network_blog_counts(); //new blog added, update network counts
 
         $url = untrailingslashit( $url );
 
@@ -1923 +1925 @@
  *  @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.5.2
+ *
+ */
+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.5.2
+ *
+ */
+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

wp-admin/includes/ms.php

@@ -122 +122 @@
                 }
 
                 clean_blog_cache( $blog );
+                wp_update_network_blog_counts(); //blog deleted, update network counts
+
         }
 
         if ( $switch )
@@ -168 +170 @@
         $wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
 
         clean_user_cache( $user );
+        wp_update_network_user_counts(); //user deleted, update network counts
 
         // allow for commit transaction
         do_action( 'deleted_user', $id );