Ticket #58392: 58392.2.diff

src/wp-includes/post.php

@@ -3573 +3573 @@
                 return false;
         }
 
+        $previous_status = $post->post_status;
+
         /**
          * Filters whether a post trashing should take place.
          *
          * @since 4.9.0
+         * @since 6.3.0 Added the `$previous_status` parameter.
          *
-         * @param bool|null $trash Whether to go forward with trashing.
-         * @param WP_Post   $post  Post object.
+         * @param bool|null $trash           Whether to go forward with trashing.
+         * @param WP_Post   $post            Post object.
+         * @param string    $previous_status The status of the post about to be trashed.
          */
-        $check = apply_filters( 'pre_trash_post', null, $post );
+        $check = apply_filters( 'pre_trash_post', null, $post, $previous_status );
 
         if ( null !== $check ) {
                 return $check;
@@ -3591 +3595 @@
          * Fires before a post is sent to the Trash.
          *
          * @since 3.3.0
+         * @since 6.3.0 Added the `$previous_status` parameter.
          *
-         * @param int $post_id Post ID.
+         * @param int    $post_id         Post ID.
+         * @param string $previous_status The status of the post about to be trashed.
          */
-        do_action( 'wp_trash_post', $post_id );
+        do_action( 'wp_trash_post', $post_id, $previous_status );
 
-        add_post_meta( $post_id, '_wp_trash_meta_status', $post->post_status );
+        add_post_meta( $post_id, '_wp_trash_meta_status', $previous_status );
         add_post_meta( $post_id, '_wp_trash_meta_time', time() );
 
         $post_updated = wp_update_post(
@@ -3616 +3622 @@
          * Fires after a post is sent to the Trash.
          *
          * @since 2.9.0
+         * @since 6.3.0 Added the `$previous_status` parameter.
          *
-         * @param int $post_id Post ID.
+         * @param int    $post_id         Post ID.
+         * @param string $previous_status The status of the post at the point where it was trashed.
          */
-        do_action( 'trashed_post', $post_id );
+        do_action( 'trashed_post', $post_id, $previous_status );
 
         return $post;
 }
@@ -3653 +3661 @@
          * Filters whether a post untrashing should take place.
          *
          * @since 4.9.0
-         * @since 5.6.0 The `$previous_status` parameter was added.
+         * @since 5.6.0 Added the `$previous_status` parameter.
          *
          * @param bool|null $untrash         Whether to go forward with untrashing.
          * @param WP_Post   $post            Post object.
@@ -3668 +3676 @@
          * Fires before a post is restored from the Trash.
          *
          * @since 2.9.0
-         * @since 5.6.0 The `$previous_status` parameter was added.
+         * @since 5.6.0 Added the `$previous_status` parameter.
          *
          * @param int    $post_id         Post ID.
          * @param string $previous_status The status of the post at the point where it was trashed.
@@ -3714 +3722 @@
          * Fires after a post is restored from the Trash.
          *
          * @since 2.9.0
-         * @since 5.6.0 The `$previous_status` parameter was added.
+         * @since 5.6.0 Added the `$previous_status` parameter.
          *
          * @param int    $post_id         Post ID.
          * @param string $previous_status The status of the post at the point where it was trashed.