Ticket #12531: 12531.6.2.patch

wp-admin/includes/ms.php

@@ -76 +76 @@
 
         update_blog_status( $blog_id, 'deleted', 1 );
 
+        delete_site_transient( 'blog_count' );
+
         if ( $drop ) {
                 $drop_tables = $wpdb->get_results( "SHOW TABLES LIKE '{$blog_prefix}%'", ARRAY_A );
                 $drop_tables = apply_filters( 'wpmu_drop_tables', $drop_tables );
@@ -167 +169 @@
         $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
 
         clean_user_cache( $id );
+        
+        delete_site_transient( 'user_count' ); 
 
         // allow for commit transaction
         do_action( 'deleted_user', $id );
@@ -528 +532 @@
                         do_action( 'make_ham_user', $id );
         }
 
+        delete_site_transient( 'user_count' );
+
         return $value;
 }
 

wp-includes/ms-blogs.php

@@ -508 +508 @@
                         do_action( "make_ham_blog", $blog_id );
         }
 
+        delete_site_transient( 'blog_count' ); 
+
         return $value;
 }
 

wp-includes/ms-functions.php

@@ -11 +11 @@
         global $wpdb;
 
         $stats['blogs'] = get_blog_count();
+        $stats['users'] = get_user_count();
 
-        $count_ts = get_site_option( 'user_count_ts' );
-        if ( time() - $count_ts > 3600 ) {
-                $count = $wpdb->get_var( "SELECT COUNT(ID) FROM $wpdb->users" );
-                update_site_option( 'user_count', $count );
-                update_site_option( 'user_count_ts', time() );
-        } else {
-                $count = get_site_option( 'user_count' );
-        }
-        $stats['users'] = $count;
         return $stats;
 }
 
@@ -204 +196 @@
 function get_user_count() {
         global $wpdb;
 
-        $count_ts = get_site_option( "user_count_ts" );
-        if ( time() - $count_ts > 3600 ) {
-                $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'") );
-                update_site_option( "user_count", $count );
-                update_site_option( "user_count_ts", time() );
-        }
+        $count = get_site_transient( 'user_count' );
+        if ( false !== $count )
+                return $count;
 
-        $count = get_site_option( "user_count" );
-
-        return $count;
+        $count = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" ); 
+        set_site_transient( 'user_count', (int) $count );       
+                
+        return (int) $count;
 }
 
-function get_blog_count( $id = 0 ) {
+function get_blog_count( $site_id = 0 ) {
         global $wpdb;
 
-        if ( $id == 0 )
-                $id = $wpdb->siteid;
+        if ( $site_id == 0 )
+                $site_id = $wpdb->siteid;
 
-        $count_ts = get_site_option( "blog_count_ts" );
-        if ( time() - $count_ts > 3600 ) {
-                $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'", $id) );
-                update_site_option( "blog_count", $count );
-                update_site_option( "blog_count_ts", time() );
-        }
+        $count = get_site_transient( 'blog_count' );
+        if ( false !== $count )
+                return $count;
+        
+        $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'", $site_id) ); 
+        set_site_transient( 'blog_count', (int) $count ); 
 
-        $count = get_site_option( "blog_count" );
-
-        return $count;
+        return (int) $count;
 }
 
 function get_blog_post( $blog_id, $post_id ) {
@@ -786 +774 @@
                 return false;
 
         // Newly created users have no roles or caps until they are added to a blog.
-        update_user_option($user_id, 'capabilities', '');
-        update_user_option($user_id, 'user_level', '');
+        delete_user_option($user_id, 'capabilities' );
+        delete_user_option($user_id, 'user_level' );
 
         do_action( 'wpmu_new_user', $user_id );
+        
+        delete_site_transient( 'user_count' );
 
         return $user_id;
 }
@@ -838 +828 @@
         restore_current_blog();
         do_action( 'wpmu_new_blog', $blog_id, $user_id );
 
+        delete_site_transient( 'blog_count' );
+        
         return $blog_id;
 }