Changeset 55419

Timestamp:

02/24/2023 01:21:54 AM (2 years ago)

Author:

SergeyBiryukov

Message:

Posts, Post Types: Pass the post object to _update_posts_count_on_delete().

The function checks the status of the post being deleted, and then only calls update_posts_count() if the deleted post was previously published, as the update query would be unnecessary otherwise.

However, by the time the function runs, the post is already deleted from the database, and the post status check fails.

This commit uses the previously retrieved post object for the status check, so that the function proceeds as expected.

Includes updating the unit test to call wp_delete_post() with the $force_delete argument, so that the post is actually deleted, not trashed, and the after_delete_post action is run.

Follow-up to [28835], [52207], [54760], [54762].

Fixes #57023.

Location:

trunk

Files:

• src/wp-includes/ms-blogs.php (modified) (1 diff)
• src/wp-includes/ms-default-filters.php (modified) (1 diff)
• tests/phpunit/tests/multisite/updatePostsCount.php (modified) (2 diffs)

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

@@ -878 +878 @@
  *
  * @since 4.0.0
- *
- * @param int $post_id Post ID.
- */
-function _update_posts_count_on_delete( $post_id ) {
-    $post = get_post( $post_id );
-
+ * @since 6.2.0 Added the `$post` parameter.
+ *
+ * @param int     $post_id Post ID.
+ * @param WP_Post $post    Post object.
+ */
+function _update_posts_count_on_delete( $post_id, $post ) {
     if ( ! $post || 'publish' !== $post->post_status || 'post' !== $post->post_type ) {
         return;

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

@@ -76 +76 @@
 
 // Administration.
-add_action( 'after_delete_post', '_update_posts_count_on_delete' );
+add_action( 'after_delete_post', '_update_posts_count_on_delete', 10, 2 );
 add_action( 'delete_post', '_update_blog_date_on_post_delete' );
 add_action( 'transition_post_status', '_update_blog_date_on_post_publish', 10, 3 );

trunk/tests/phpunit/tests/multisite/updatePostsCount.php

@@ -31 +31 @@
             $post_count_after_creating = get_site()->post_count;
 
-            wp_delete_post( $post_id );
+            wp_delete_post( $post_id, true );
 
             $post_count_after_deleting = get_site()->post_count;
@@ -48 +48 @@
             /*
              * Check that posts count is updated when a post is deleted:
-             * add_action( 'deleted_post', '_update_posts_count_on_delete' );
+             * add_action( 'after_delete_post', '_update_posts_count_on_delete', 10, 2 );
              *
              * Check that _update_posts_count_on_delete() is called on that filter,