<!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>[28835] trunk: `get_blog_details()->post_count` should update on more actions than just `publish_post`.</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/28835">28835</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-26 00:52:25 +0000 (Thu, 26 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>`get_blog_details()->post_count` should update on more actions than just `publish_post`.
Adds unit test.
Props 5um17, midxcat, strangerstudios.
Fixes <a href="http://core.trac.wordpress.org/ticket/27952">#27952</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmsblogsphp">trunk/src/wp-includes/ms-blogs.php</a></li>
<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="trunksrcwpincludesmsblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/ms-blogs.php (28834 => 28835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/ms-blogs.php 2014-06-25 23:35:02 UTC (rev 28834)
+++ trunk/src/wp-includes/ms-blogs.php 2014-06-26 00:52:25 UTC (rev 28835)
</span><span class="lines">@@ -892,3 +892,38 @@
</span><span class="cx"> wpmu_update_blogs_date();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Handler for updating the blog posts count date when a post is deleted.
+ *
+ * @since 4.0
+ *
+ * @param int $post_id Post ID
+ */
+function _update_posts_count_on_delete( $post_id ) {
+ if ( 'publish' !== get_post_field( 'post_status', $post_id ) ) {
+ return;
+ }
+
+ update_posts_count();
+}
+
+/**
+ * Handler for updating the blog posts count date when a post status changes.
+ *
+ * @since 4.0
+ *
+ * @param string $new_status The status the post is changing to.
+ * @param string $old_status The status the post is changing from.
+ */
+function _update_posts_count_on_transition_post_status( $new_status, $old_status ) {
+ if ( $new_status === $old_status ) {
+ return;
+ }
+
+ if ( 'publish' !== $new_status && 'publish' !== $old_status ) {
+ return;
+ }
+
+ update_posts_count();
+}
+
</ins></span></pre></div>
<a id="trunksrcwpincludesmsdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/ms-default-filters.php (28834 => 28835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/ms-default-filters.php 2014-06-25 23:35:02 UTC (rev 28834)
+++ trunk/src/wp-includes/ms-default-filters.php 2014-06-26 00:52:25 UTC (rev 28835)
</span><span class="lines">@@ -34,9 +34,10 @@
</span><span class="cx">
</span><span class="cx"> // Administration
</span><span class="cx"> add_filter( 'term_id_filter', 'global_terms', 10, 2 );
</span><del>-add_action( 'publish_post', 'update_posts_count' );
</del><ins>+add_action( 'delete_post', '_update_posts_count_on_delete' );
</ins><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>+add_action( 'transition_post_status', '_update_posts_count_on_transition_post_status', 10, 2 );
</ins><span class="cx">
</span><span class="cx"> // Counts
</span><span class="cx"> add_action( 'admin_init', 'wp_schedule_update_network_counts');
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/ms-functions.php (28834 => 28835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/ms-functions.php 2014-06-25 23:35:02 UTC (rev 28834)
+++ trunk/src/wp-includes/ms-functions.php 2014-06-26 00:52:25 UTC (rev 28835)
</span><span class="lines">@@ -1761,7 +1761,7 @@
</span><span class="cx"> * WordPress MS stores a blog's post count as an option so as
</span><span class="cx"> * to avoid extraneous COUNTs when a blog's details are fetched
</span><span class="cx"> * with get_blog_details(). This function is called when posts
</span><del>- * are published to make sure the count stays current.
</del><ins>+ * are published or unpublished to make sure the count stays current.
</ins><span class="cx"> *
</span><span class="cx"> * @since MU
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunktestsphpunittestsmsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/ms.php (28834 => 28835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/ms.php 2014-06-25 23:35:02 UTC (rev 28834)
+++ trunk/tests/phpunit/tests/ms.php 2014-06-26 00:52:25 UTC (rev 28835)
</span><span class="lines">@@ -1385,6 +1385,18 @@
</span><span class="cx"> $GLOBALS['super_admins'] = $old_global;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @ticket 27952
+ */
+ function test_posts_count() {
+ $this->factory->post->create();
+ $post2 = $this->factory->post->create();
+ $this->assertEquals( 2, get_blog_details()->post_count );
+
+ wp_delete_post( $post2 );
+ $this->assertEquals( 1, get_blog_details()->post_count );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> endif;
</span></span></pre>
</div>
</div>
</body>
</html>