summaryrefslogtreecommitdiffstats
path: root/wp-includes/class-wp-customize-manager.php
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--wp-includes/class-wp-customize-manager.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php
index 24f8251..baad9fe 100644
--- a/wp-includes/class-wp-customize-manager.php
+++ b/wp-includes/class-wp-customize-manager.php
@@ -3079,25 +3079,26 @@ final class WP_Customize_Manager {
return false;
}
+ $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;
}
/** This action is documented in wp-includes/post.php */
- 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() );
- $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 );
+ wp_transition_post_status( $new_status, $previous_status, $post );
/** This action is documented in wp-includes/post.php */
do_action( "edit_post_{$post->post_type}", $post->ID, $post );
@@ -3119,7 +3120,7 @@ final class WP_Customize_Manager {
wp_trash_post_comments( $post_id );
/** 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;
}
@@ -5197,10 +5198,9 @@ final class WP_Customize_Manager {
array(
'label' => __( 'Site Icon' ),
'description' => sprintf(
- '<p>' . __( 'Site Icons are what you see in browser tabs, bookmark bars, and within the WordPress mobile apps. Upload one here!' ) . '</p>' .
- /* translators: %s: Site icon size in pixels. */
- '<p>' . __( 'Site Icons should be square and at least %s pixels.' ) . '</p>',
- '<strong>512 &times; 512</strong>'
+ /* translators: %s: Site Icon size in pixels. */
+ '<p>' . __( 'The Site Icon is what you see in browser tabs, bookmark bars, and within the WordPress mobile apps. It should be square and at least %s pixels.' ) . '</p>',
+ '<code>512 &times; 512</code>'
),
'section' => 'title_tagline',
'priority' => 60,