Changeset 57238

Timestamp:

01/03/2024 04:20:02 PM (11 months ago)

Author:

SergeyBiryukov

Message:

Customize: Pass the previous status to post trash hooks when trashing a changeset.

This ensures that the correct number of arguments is passed to post trash hooks in WP_Customize_Manager::trash_changeset_post(), which bypasses wp_trash_post().

Follow-up to [56043].

Props joelcj91, mukesh27.
Fixes #60183.

File:

• trunk/src/wp-includes/class-wp-customize-manager.php (modified) (4 diffs)

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -3080 +3080 @@
         }
 
+        $previous_status = $post->post_status;
+
         /** This filter is documented in wp-includes/post.php */
-        $check = apply_filters( 'pre_trash_post', null, $post );
+        $check = apply_filters( 'pre_trash_post', null, $post, $previous_status );
         if ( null !== $check ) {
             return $check;
@@ -3087 +3089 @@
 
         /** This action is documented in wp-includes/post.php */
-        do_action( 'wp_trash_post', $post_id );
-
-        add_post_meta( $post_id, '_wp_trash_meta_status', $post->post_status );
+        do_action( 'wp_trash_post', $post_id, $previous_status );
+
+        add_post_meta( $post_id, '_wp_trash_meta_status', $previous_status );
         add_post_meta( $post_id, '_wp_trash_meta_time', time() );
 
-        $old_status = $post->post_status;
         $new_status = 'trash';
         $wpdb->update( $wpdb->posts, array( 'post_status' => $new_status ), array( 'ID' => $post->ID ) );
@@ -3098 +3099 @@
 
         $post->post_status = $new_status;
-        wp_transition_post_status( $new_status, $old_status, $post );
+        wp_transition_post_status( $new_status, $previous_status, $post );
 
         /** This action is documented in wp-includes/post.php */
@@ -3120 +3121 @@
 
         /** This action is documented in wp-includes/post.php */
-        do_action( 'trashed_post', $post_id );
+        do_action( 'trashed_post', $post_id, $previous_status );
 
         return $post;