From a1005ad7f980c197b255038376a3860db7c62cf6 Mon Sep 17 00:00:00 2001 From: Rachel Baker Date: Sun, 4 Dec 2016 20:27:35 +0000 Subject: [PATCH] REST API: Merge similar date strings in the revisions and comments controllers. Merges [39488] to the 4.7 branch. Props ramiy. Fixes #39016 for 4.7. Built from https://develop.svn.wordpress.org/branches/4.7@39489 git-svn-id: http://core.svn.wordpress.org/branches/4.7@39429 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../rest-api/endpoints/class-wp-rest-comments-controller.php | 4 ++-- .../rest-api/endpoints/class-wp-rest-revisions-controller.php | 4 ++-- wp-includes/version.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php index 6e1e05d076..e2f64353bc 100644 --- a/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php +++ b/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php @@ -1202,13 +1202,13 @@ class WP_REST_Comments_Controller extends WP_REST_Controller { ), ), 'date' => array( - 'description' => __( 'The date the object was published.' ), + 'description' => __( "The date the object was published, in the site's timezone." ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'view', 'edit', 'embed' ), ), 'date_gmt' => array( - 'description' => __( 'The date the object was published as GMT.' ), + 'description' => __( 'The date the object was published, as GMT.' ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'view', 'edit' ), diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php index 3b45d9f987..39ef8fe818 100644 --- a/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php +++ b/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php @@ -404,7 +404,7 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller { 'context' => array( 'view', 'edit', 'embed' ), ), 'date' => array( - 'description' => __( 'The date the object was published.' ), + 'description' => __( "The date the object was published, in the site's timezone." ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'view', 'edit', 'embed' ), @@ -426,7 +426,7 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller { 'context' => array( 'view', 'edit', 'embed' ), ), 'modified' => array( - 'description' => __( 'The date the object was last modified.' ), + 'description' => __( "The date the object was last modified, in the site's timezone." ), 'type' => 'string', 'format' => 'date-time', 'context' => array( 'view', 'edit' ), diff --git a/wp-includes/version.php b/wp-includes/version.php index f1509902b4..05c6963c41 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-RC2-39485'; +$wp_version = '4.7-RC2-39489'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.