get_blog_details()->post_count should update on more actions than just publish_post.

staylor · staylor · commit b917e7998d7f · 2014-06-26T00:52:25.000Z
Adds unit test. Props 5um17, midxcat, strangerstudios. Fixes #27952. git-svn-id: https://develop.svn.wordpress.org/trunk@28835 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-includes/ms-blogs.php b/src/wp-includes/ms-blogs.php
@@ -892,3 +892,38 @@ function _update_blog_date_on_post_delete( $post_id ) {
 	wpmu_update_blogs_date();
 }
 
+/**
+ * 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();
+}
+
diff --git a/src/wp-includes/ms-default-filters.php b/src/wp-includes/ms-default-filters.php
@@ -34,9 +34,10 @@
 
 // Administration
 add_filter( 'term_id_filter', 'global_terms', 10, 2 );
-add_action( 'publish_post', 'update_posts_count' );
+add_action( 'delete_post', '_update_posts_count_on_delete' );
 add_action( 'delete_post', '_update_blog_date_on_post_delete' );
 add_action( 'transition_post_status', '_update_blog_date_on_post_publish', 10, 3 );
+add_action( 'transition_post_status', '_update_posts_count_on_transition_post_status', 10, 2 );
 
 // Counts
 add_action( 'admin_init', 'wp_schedule_update_network_counts');
diff --git a/src/wp-includes/ms-functions.php b/src/wp-includes/ms-functions.php
@@ -1761,7 +1761,7 @@ function check_upload_mimes( $mimes ) {
  * WordPress MS stores a blog's post count as an option so as
  * to avoid extraneous COUNTs when a blog's details are fetched
  * with get_blog_details(). This function is called when posts
- * are published to make sure the count stays current.
+ * are published or unpublished to make sure the count stays current.
  *
  * @since MU
  */
diff --git a/tests/phpunit/tests/ms.php b/tests/phpunit/tests/ms.php
@@ -1385,6 +1385,18 @@ function test_granting_super_admins() {
 			$GLOBALS['super_admins'] = $old_global;
 		}
 	}
+
+	/**
+	 * @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 );
+	}
 }
 
 endif;

Original file line number	Diff line number	Diff line change
`@@ -1761,7 +1761,7 @@ function check_upload_mimes( $mimes ) {`
`1761`	`1761`	`* WordPress MS stores a blog's post count as an option so as`
`1762`	`1762`	`* to avoid extraneous COUNTs when a blog's details are fetched`
`1763`	`1763`	`* with get_blog_details(). This function is called when posts`
`1764`		`- * are published to make sure the count stays current.`
	`1764`	`+ * are published or unpublished to make sure the count stays current.`
`1765`	`1765`	`*`
`1766`	`1766`	`* @since MU`
`1767`	`1767`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -1385,6 +1385,18 @@ function test_granting_super_admins() {`
`1385`	`1385`	`$GLOBALS['super_admins'] = $old_global;`
`1386`	`1386`	`}`
`1387`	`1387`	`}`
	`1388`	`+`
	`1389`	`+ /**`
	`1390`	`+ * @ticket 27952`
	`1391`	`+ */`
	`1392`	`+ function test_posts_count() {`
	`1393`	`+ $this->factory->post->create();`
	`1394`	`+ $post2 = $this->factory->post->create();`
	`1395`	`+ $this->assertEquals( 2, get_blog_details()->post_count );`
	`1396`	`+`
	`1397`	`+ wp_delete_post( $post2 );`
	`1398`	`+ $this->assertEquals( 1, get_blog_details()->post_count );`
	`1399`	`+ }`
`1388`	`1400`	`}`
`1389`	`1401`
`1390`	`1402`	`endif;`