Changeset 41824 for trunk/src/wp-includes/theme.php

Timestamp:

10/11/2017 05:41:14 AM (7 years ago)

Author:

westonruter

Message:

Customize: Introduce WP_Customize_Manager::trash_changeset_post() to reduce duplication and ensure proper changeset trashing logic.

Trashing a changeset via wp_trash_post() does not have the desired result since it mutates post_content (via Kses) and the post_name (even though it is a UUID).

Props dlh.
See #39896, #42030.
Fixes #42175.

File:

• trunk/src/wp-includes/theme.php (modified) (1 diff)

trunk/src/wp-includes/theme.php

@@ -2910 +2910 @@
      */
     if ( ! wp_revisions_enabled( $changeset_post ) ) {
-        $post = $changeset_post;
-        $post_id = $changeset_post->ID;
-
-        /*
-         * The following re-formulates the logic from wp_trash_post() as done in
-         * wp_publish_post(). The reason for bypassing wp_trash_post() is that it
-         * will mutate the post_content and the post_name when they should be
-         * untouched.
-         */
-        if ( ! EMPTY_TRASH_DAYS ) {
-            wp_delete_post( $post_id, true );
-        } else {
-            /** 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 );
-            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 ) );
-            clean_post_cache( $post->ID );
-
-            $post->post_status = $new_status;
-            wp_transition_post_status( $new_status, $old_status, $post );
-
-            /** This action is documented in wp-includes/post.php */
-            do_action( 'edit_post', $post->ID, $post );
-
-            /** This action is documented in wp-includes/post.php */
-            do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
-
-            /** This action is documented in wp-includes/post.php */
-            do_action( 'save_post', $post->ID, $post, true );
-
-            /** This action is documented in wp-includes/post.php */
-            do_action( 'wp_insert_post', $post->ID, $post, true );
-
-            /** This action is documented in wp-includes/post.php */
-            do_action( 'trashed_post', $post_id );
-        }
+        $wp_customize->trash_changeset_post( $changeset_post->ID );
     }
 }