Changeset 28835

Timestamp:

06/26/2014 12:52:25 AM (12 years ago)

Author:

wonderboymusic

Message:

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

Adds unit test.

Props 5um17, midxcat, strangerstudios.
Fixes #27952.

Location:

trunk

Files:

• src/wp-includes/ms-blogs.php (modified) (1 diff)
• src/wp-includes/ms-default-filters.php (modified) (1 diff)
• src/wp-includes/ms-functions.php (modified) (1 diff)
• tests/phpunit/tests/ms.php (modified) (1 diff)

trunk/src/wp-includes/ms-blogs.php

@@ -893 +893 @@
 }
 
+/**
+ * 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();
+}
+

trunk/src/wp-includes/ms-default-filters.php

@@ -35 +35 @@
 // 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

trunk/src/wp-includes/ms-functions.php

@@ -1762 +1762 @@
  * 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

trunk/tests/phpunit/tests/ms.php

@@ -1386 +1386 @@
                 }
         }
+
+        /**
+         * @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 );
+        }
 }