Ticket #12531: onlyimprove.patch

wp-admin/includes/ms.php

@@ -161 +161 @@
         // allow for commit transaction
         do_action('deleted_user', $id);
 
+        delete_site_transient( 'user_count' );
+
         return true;
 }
 
@@ -498 +500 @@
                         do_action( "make_ham_user", $id );
         }
 
+        delete_site_transient( 'user_count' );
+
         return $value;
 }
 

wp-includes/ms-blogs.php

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

wp-includes/ms-functions.php

@@ -9 +9 @@
         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;
 }
 
@@ -202 +194 @@
 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' );
 
-        $count = get_site_option( "user_count" );
+        if ( false !== $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', $count );
+
         return $count;
 }
 
@@ -220 +212 @@
         if ( $id == 0 )
                 $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( 'user_count' );
 
-        $count = get_site_option( "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' AND mature = '0'", $id) );
+
+        set_site_transient( 'blog_count', $count );
+
         return $count;
 }
 
@@ -836 +828 @@
 
         restore_current_blog();
         do_action( 'wpmu_new_blog', $blog_id, $user_id );
-
+        
+        delete_site_transient( 'user_count' );
+        
         return $blog_id;
 }