<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[25621] trunk: Live network counts of users and sites for small networks.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25621">25621</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-09-25 16:20:21 +0000 (Wed, 25 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Live network counts of users and sites for small networks.
props adamsilverstein, jeremyfelt.
fixes <a href="http://core.trac.wordpress.org/ticket/22917">#22917</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmsdefaultfiltersphp">trunk/src/wp-includes/ms-default-filters.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunktestsphpunittestsmsphp">trunk/tests/phpunit/tests/ms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmsdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/ms-default-filters.php (25620 => 25621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/ms-default-filters.php 2013-09-25 16:13:44 UTC (rev 25620)
+++ trunk/src/wp-includes/ms-default-filters.php 2013-09-25 16:20:21 UTC (rev 25621)
</span><span class="lines">@@ -37,8 +37,15 @@
</span><span class="cx"> add_action( 'publish_post', 'update_posts_count' );
</span><span class="cx"> add_action( 'delete_post', '_update_blog_date_on_post_delete' );
</span><span class="cx"> add_action( 'transition_post_status', '_update_blog_date_on_post_publish', 10, 3 );
</span><ins>+
+// Counts
</ins><span class="cx"> add_action( 'admin_init', 'wp_schedule_update_network_counts');
</span><span class="cx"> add_action( 'update_network_counts', 'wp_update_network_counts');
</span><ins>+foreach ( array( 'user_register', 'deleted_user', 'wpmu_new_user', 'make_spam_user', 'make_ham_user' ) as $action )
+ add_action( $action, 'wp_maybe_update_network_user_counts' );
+foreach ( array( 'make_spam_blog', 'make_ham_blog', 'archive_blog', 'unarchive_blog', 'make_delete_blog', 'make_undelete_blog' ) as $action )
+ add_action( $action, 'wp_maybe_update_network_site_counts' );
+unset( $action );
</ins><span class="cx">
</span><span class="cx"> // Files
</span><span class="cx"> add_filter( 'wp_upload_bits', 'upload_is_file_too_big' );
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/ms-functions.php (25620 => 25621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/ms-functions.php 2013-09-25 16:13:44 UTC (rev 25620)
+++ trunk/src/wp-includes/ms-functions.php 2013-09-25 16:20:21 UTC (rev 25621)
</span><span class="lines">@@ -1102,6 +1102,9 @@
</span><span class="cx">
</span><span class="cx"> $blog_id = $wpdb->insert_id;
</span><span class="cx"> refresh_blog_details( $blog_id );
</span><ins>+
+ wp_maybe_update_network_site_counts();
+
</ins><span class="cx"> return $blog_id;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1876,11 +1879,84 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx"> function wp_update_network_counts() {
</span><ins>+ wp_update_network_user_counts();
+ wp_update_network_site_counts();
+}
+
+/**
+ * Update the count of sites for the current network.
+ *
+ * If enabled through the 'enable_live_network_counts' filter, update the sites count
+ * on a network when a site is created or its status is updated.
+ *
+ * @since 3.7.0
+ *
+ * @uses wp_update_network_site_counts()
+ */
+function wp_maybe_update_network_site_counts() {
+ $is_small_network = ! wp_is_large_network( 'sites' );
+
+ /**
+ * Filter the decision to update network user and site counts in real time.
+ *
+ * @since 3.7.0
+ *
+ * @param bool $small_network Based on wp_is_large_network( $context ).
+ * @param string $context Context. Either 'users' or 'sites'.
+ */
+ if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) )
+ return;
+
+ wp_update_network_site_counts();
+}
+
+/**
+ * Update the network-wide users count.
+ *
+ * If enabled through the 'enable_live_network_counts' filter, update the users count
+ * on a network when a user is created or its status is updated.
+ *
+ * @since 3.7.0
+ *
+ * @uses wp_update_network_user_counts()
+ */
+function wp_maybe_update_network_user_counts() {
+ $is_small_network = ! wp_is_large_network( 'users' );
+
+ /**
+ * Filter the decision to update network user and site counts in real time.
+ *
+ * @since 3.7.0
+ *
+ * @param bool $small_network Based on wp_is_large_network( $context ).
+ * @param string $context Context. Either 'users' or 'sites'.
+ */
+ if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) )
+ return;
+
+ wp_update_network_user_counts();
+}
+
+/**
+ * Update the network-wide site count.
+ *
+ * @since 3.7.0
+ */
+function wp_update_network_site_counts() {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $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) );
</span><span class="cx"> update_site_option( 'blog_count', $count );
</span><ins>+}
</ins><span class="cx">
</span><ins>+/**
+ * Update the network-wide user count.
+ *
+ * @since 3.7.0
+ */
+function wp_update_network_user_counts() {
+ global $wpdb;
+
</ins><span class="cx"> $count = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
</span><span class="cx"> update_site_option( 'user_count', $count );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsmsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/ms.php (25620 => 25621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/ms.php 2013-09-25 16:13:44 UTC (rev 25620)
+++ trunk/tests/phpunit/tests/ms.php 2013-09-25 16:20:21 UTC (rev 25621)
</span><span class="lines">@@ -16,6 +16,63 @@
</span><span class="cx"> $_SERVER['REMOTE_ADDR'] = '';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * @ticket 22917
+ */
+ function test_enable_live_network_site_counts_filter() {
+ $site_count_start = get_blog_count();
+ // false for large networks by default
+ add_filter( 'enable_live_network_counts', '__return_false' );
+ $this->factory->blog->create_many( 4 );
+
+ // count only updated when cron runs, so unchanged
+ $this->assertEquals( $site_count_start, (int) get_blog_count() );
+
+ add_filter( 'enable_live_network_counts', '__return_true' );
+ $site_ids = $this->factory->blog->create_many( 4 );
+
+ $this->assertEquals( $site_count_start + 9, (int) get_blog_count() );
+
+ //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() {
+ // false for large networks by default
+ add_filter( 'enable_live_network_counts', '__return_false' );
+
+ // Refresh the cache
+ wp_update_network_counts();
+ $start_count = get_user_count();
+
+ wpmu_create_user( 'user', 'pass', 'email' );
+
+ // No change, cache not refreshed
+ $count = get_user_count();
+
+ $this->assertEquals( $start_count, $count );
+
+ wp_update_network_counts();
+ $start_count = get_user_count();
+
+ add_filter( 'enable_live_network_counts', '__return_true' );
+
+ wpmu_create_user( 'user2', 'pass2', 'email2' );
+
+ $count = get_user_count();
+ $this->assertEquals( $start_count + 1, $count );
+
+ remove_filter( 'enable_live_network_counts', '__return_false' );
+ remove_filter( 'enable_live_network_counts', '__return_true' );
+ }
+
</ins><span class="cx"> function test_create_and_delete_blog() {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="lines">@@ -230,6 +287,8 @@
</span><span class="cx"> wp_update_network_counts();
</span><span class="cx"> $start_count = get_user_count();
</span><span class="cx">
</span><ins>+ // Only false for large networks as of 3.7
+ add_filter( 'enable_live_network_counts', '__return_false' );
</ins><span class="cx"> $this->factory->user->create( array( 'role' => 'administrator' ) );
</span><span class="cx">
</span><span class="cx"> $count = get_user_count(); // No change, cache not refreshed
</span><span class="lines">@@ -239,6 +298,7 @@
</span><span class="cx">
</span><span class="cx"> $count = get_user_count();
</span><span class="cx"> $this->assertEquals( $start_count + 1, $count );
</span><ins>+ remove_filter( 'enable_live_network_counts', '__return_false' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_wp_schedule_update_network_counts() {
</span></span></pre>
</div>
</div>
</body>
</html>