From bdee44c461d31cc28f8a9267597221a87e59bf74 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Thu, 2 Nov 2017 19:59:55 +0000 Subject: [PATCH] Customize: Always use underlying changeset post date as initial date in scheduled date fields if date is future. Prevent user from having to re-enter the previously-supplied future date if they had switched from schedule to draft but wanted to switch back again. Improves parity with behavior of post edit screen. Props dlh, westonruter, obenland. See #39896, #28721. Fixes #42413. git-svn-id: https://develop.svn.wordpress.org/trunk@42109 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-customize-manager.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/wp-includes/class-wp-customize-manager.php b/src/wp-includes/class-wp-customize-manager.php index 4e66070292..607349b04a 100644 --- a/src/wp-includes/class-wp-customize-manager.php +++ b/src/wp-includes/class-wp-customize-manager.php @@ -4583,10 +4583,14 @@ final class WP_Customize_Manager { $changeset_post = get_post( $changeset_post_id ); } - if ( $this->changeset_post_id() && 'future' === get_post_status( $this->changeset_post_id() ) ) { - $initial_date = get_the_time( 'Y-m-d H:i:s', $this->changeset_post_id() ); - } else { - $initial_date = current_time( 'mysql', false ); + // Determine initial date to be at present or future, not past. + $current_time = current_time( 'mysql', false ); + $initial_date = $current_time; + if ( $changeset_post ) { + $initial_date = get_the_time( 'Y-m-d H:i:s', $changeset_post->ID ); + if ( $initial_date < $current_time ) { + $initial_date = $current_time; + } } $lock_user_id = false; @@ -4607,7 +4611,7 @@ final class WP_Customize_Manager { 'statusChoices' => $status_choices, 'lockUser' => $lock_user_id ? $this->get_lock_user_data( $lock_user_id ) : null, ), - 'initialServerDate' => current_time( 'mysql', false ), + 'initialServerDate' => $current_time, 'dateFormat' => get_option( 'date_format' ), 'timeFormat' => get_option( 'time_format' ), 'initialServerTimestamp' => floor( microtime( true ) * 1000 ),