Changeset 40114 for branches/4.7/src/wp-includes/rest-api.php

Timestamp:

02/24/2017 09:58:07 PM (8 years ago)

Author:

SergeyBiryukov

Message:

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.

Props jnylen0.
Merges [40101] to the 4.7 branch.
Fixes #39256.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-includes/rest-api.php (modified) (3 diffs)

branches/4.7/src/wp-includes/rest-api.php

@@ -781 +781 @@
 
 /**
- * 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
@@ -787 +787 @@
  * @see rest_parse_date()
  *
- * @param string $date      RFC3339 timestamp.
- * @param bool   $force_utc Whether a UTC timestamp should be forced. Default false.
+ * @param string $date   RFC3339 timestamp.
+ * @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),
  *                    null on failure.
  */
-function rest_get_date_with_gmt( $date, $force_utc = false ) {
-    $date = rest_parse_date( $date, $force_utc );
+function rest_get_date_with_gmt( $date, $is_utc = false ) {
+    // 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 ) ) {
@@ -799 +804 @@
     }
 
-    $utc = date( 'Y-m-d H:i:s', $date );
-    $local = get_date_from_gmt( $utc );
+    // At this point $date could either be a local date (if we were passed a
+    // *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 );