REST API: Fix multiple issues with setting dates of posts and comments.
This commit modifies the `rest_get_date_with_gmt` function to correctly parse local and UTC timestamps with or without timezone information. It also ensures that the REST API can edit the dates of draft posts by setting the `edit_date` flag to `wp_update_post`. Overall this commit ensures that post and comment dates can be set and updated as expected. Fixes #39256. Built from https://develop.svn.wordpress.org/trunk@40101 git-svn-id: http://core.svn.wordpress.org/trunk@40038 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
c4e78a8d8b
commit
b6ce4e2830
|
@ -780,26 +780,40 @@ function rest_parse_date( $date, $force_utc = false ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves a local date with its GMT equivalent, in MySQL datetime format.
|
* Parses a date into both its local and UTC equivalent, in MySQL datetime format.
|
||||||
*
|
*
|
||||||
* @since 4.4.0
|
* @since 4.4.0
|
||||||
*
|
*
|
||||||
* @see rest_parse_date()
|
* @see rest_parse_date()
|
||||||
*
|
*
|
||||||
* @param string $date RFC3339 timestamp.
|
* @param string $date RFC3339 timestamp.
|
||||||
* @param bool $force_utc Whether a UTC timestamp should be forced. Default false.
|
* @param bool $is_utc Whether the provided date should be interpreted as UTC. Default false.
|
||||||
* @return array|null Local and UTC datetime strings, in MySQL datetime format (Y-m-d H:i:s),
|
* @return array|null Local and UTC datetime strings, in MySQL datetime format (Y-m-d H:i:s),
|
||||||
* null on failure.
|
* null on failure.
|
||||||
*/
|
*/
|
||||||
function rest_get_date_with_gmt( $date, $force_utc = false ) {
|
function rest_get_date_with_gmt( $date, $is_utc = false ) {
|
||||||
$date = rest_parse_date( $date, $force_utc );
|
// Whether or not the original date actually has a timezone string
|
||||||
|
// changes the way we need to do timezone conversion. Store this info
|
||||||
|
// before parsing the date, and use it later.
|
||||||
|
$has_timezone = preg_match( '#(Z|[+-]\d{2}(:\d{2})?)$#', $date );
|
||||||
|
|
||||||
|
$date = rest_parse_date( $date );
|
||||||
|
|
||||||
if ( empty( $date ) ) {
|
if ( empty( $date ) ) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$utc = date( 'Y-m-d H:i:s', $date );
|
// At this point $date could either be a local date (if we were passed a
|
||||||
$local = get_date_from_gmt( $utc );
|
// *local* date without a timezone offset) or a UTC date (otherwise).
|
||||||
|
// Timezone conversion needs to be handled differently between these two
|
||||||
|
// cases.
|
||||||
|
if ( ! $is_utc && ! $has_timezone ) {
|
||||||
|
$local = date( 'Y-m-d H:i:s', $date );
|
||||||
|
$utc = get_gmt_from_date( $local );
|
||||||
|
} else {
|
||||||
|
$utc = date( 'Y-m-d H:i:s', $date );
|
||||||
|
$local = get_date_from_gmt( $utc );
|
||||||
|
}
|
||||||
|
|
||||||
return array( $local, $utc );
|
return array( $local, $utc );
|
||||||
}
|
}
|
||||||
|
|
|
@ -1004,12 +1004,14 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
|
||||||
|
|
||||||
if ( ! empty( $date_data ) ) {
|
if ( ! empty( $date_data ) ) {
|
||||||
list( $prepared_post->post_date, $prepared_post->post_date_gmt ) = $date_data;
|
list( $prepared_post->post_date, $prepared_post->post_date_gmt ) = $date_data;
|
||||||
|
$prepared_post->edit_date = true;
|
||||||
}
|
}
|
||||||
} elseif ( ! empty( $schema['properties']['date_gmt'] ) && ! empty( $request['date_gmt'] ) ) {
|
} elseif ( ! empty( $schema['properties']['date_gmt'] ) && ! empty( $request['date_gmt'] ) ) {
|
||||||
$date_data = rest_get_date_with_gmt( $request['date_gmt'], true );
|
$date_data = rest_get_date_with_gmt( $request['date_gmt'], true );
|
||||||
|
|
||||||
if ( ! empty( $date_data ) ) {
|
if ( ! empty( $date_data ) ) {
|
||||||
list( $prepared_post->post_date, $prepared_post->post_date_gmt ) = $date_data;
|
list( $prepared_post->post_date, $prepared_post->post_date_gmt ) = $date_data;
|
||||||
|
$prepared_post->edit_date = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '4.8-alpha-40089';
|
$wp_version = '4.8-alpha-40101';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
|
Loading…
Reference in New Issue