<!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>[BuddyPress][9251] trunk: Blogs: Invalidate total blog count when site is deleted.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/9251">9251</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9251","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-22 03:49:43 +0000 (Mon, 22 Dec 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Blogs: Invalidate total blog count when site is deleted.
This commit:
* Uses `bp_blogs_clear_blog_object_cache()` to invalidate the total blog count after a site is deleted and when a site is created.
* Deprecates `bp_blogs_format_clear_blog_cache()`, a function that isn't used internally as of this commit, for v2.2.0.
* Adds a unit test.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6062">#6062</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogscachephp">trunk/src/bp-blogs/bp-blogs-cache.php</a></li>
<li><a href="#trunksrcbpcoredeprecated22php">trunk/src/bp-core/deprecated/2.2.php</a></li>
<li><a href="#trunktestsphpunittestcasesblogscachephp">trunk/tests/phpunit/testcases/blogs/cache.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsbpblogscachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/bp-blogs-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-cache.php 2014-12-22 03:37:00 UTC (rev 9250)
+++ trunk/src/bp-blogs/bp-blogs-cache.php 2014-12-22 03:49:43 UTC (rev 9251)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,27 +42,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $blog_id ID of the current blog.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id ID of the user whose blog cache should be cleared.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function bp_blogs_clear_blog_object_cache( $blog_id, $user_id ) {
- wp_cache_delete( 'bp_blogs_of_user_' . $user_id, 'bp' );
- wp_cache_delete( 'bp_total_blogs_for_user_' . $user_id, 'bp' );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function bp_blogs_clear_blog_object_cache( $blog_id = 0, $user_id = 0 ) {
+ if ( ! empty( $user_id ) ) {
+ wp_cache_delete( 'bp_blogs_of_user_' . $user_id, 'bp' );
+ wp_cache_delete( 'bp_total_blogs_for_user_' . $user_id, 'bp' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * Clear cache when a new blog is created.
- *
- * @since BuddyPress (1.0.0)
- *
- * @param BP_Blogs_Blog $recorded_blog_obj The recorded blog, passed by
- * 'bp_blogs_new_blog'.
- */
-function bp_blogs_format_clear_blog_cache( $recorded_blog_obj ) {
- bp_blogs_clear_blog_object_cache( false, $recorded_blog_obj->user_id );
</del><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'bp_total_blogs', 'bp' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // List actions to clear object caches on
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_blogs_remove_blog_for_user', 'bp_blogs_clear_blog_object_cache', 10, 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'bp_blogs_new_blog', 'bp_blogs_format_clear_blog_cache', 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'wpmu_new_blog', 'bp_blogs_clear_blog_object_cache', 10, 2 );
+add_action( 'bp_blogs_remove_blog', 'bp_blogs_clear_blog_object_cache' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // List actions to clear super cached pages on, if super cache is installed
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_blogs_remove_data_for_blog', 'bp_core_clear_cache' );
</span></span></pre></div>
<a id="trunksrcbpcoredeprecated22php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/deprecated/2.2.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/deprecated/2.2.php 2014-12-22 03:37:00 UTC (rev 9250)
+++ trunk/src/bp-core/deprecated/2.2.php 2014-12-22 03:49:43 UTC (rev 9251)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,3 +63,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.2', 'bp_activity_post_type_update()' );
</span><span class="cx" style="display: block; padding: 0 10px"> bp_activity_post_type_update( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Clear cache when a new blog is created.
+ *
+ * @since BuddyPress (1.0.0)
+ * @deprecated BuddyPress (2.2.0)
+ *
+ * @param BP_Blogs_Blog $recorded_blog_obj The recorded blog, passed by
+ * 'bp_blogs_new_blog'.
+ */
+function bp_blogs_format_clear_blog_cache( $recorded_blog_obj ) {
+ _deprecated_function( __FUNCTION__, '2.2', 'bp_blogs_clear_blog_object_cache()' );
+ bp_blogs_clear_blog_object_cache( false, $recorded_blog_obj->user_id );
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestcasesblogscachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/blogs/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/blogs/cache.php 2014-12-22 03:37:00 UTC (rev 9250)
+++ trunk/tests/phpunit/testcases/blogs/cache.php 2014-12-22 03:49:43 UTC (rev 9251)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,4 +254,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // check if function references cache or hits the DB by comparing query count
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $first_query_count, $wpdb->num_queries );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @group bp_blogs_total_blogs
+ */
+ public function test_bp_blogs_total_blogs_count_after_delete_blog() {
+ if ( ! is_multisite() ) {
+ return;
+ }
+
+ $u = $this->factory->user->create();
+
+ // need to make sure we set the 'public' flag due to how BP_Blogs_Blogs:get_all() works
+ $b1 = $this->factory->blog->create( array(
+ 'meta' => array(
+ 'public' => 1
+ )
+ ) );
+ $b2 = $this->factory->blog->create( array(
+ 'meta' => array(
+ 'public' => 1
+ )
+ ) );
+
+ bp_blogs_record_blog( $b1, $u );
+ bp_blogs_record_blog( $b2, $u );
+
+ // prime total blog count
+ bp_blogs_total_blogs();
+
+ // delete a blog
+ wpmu_delete_blog( $b2 );
+
+ $this->assertEquals( 1, bp_blogs_total_blogs() );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>