WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Rachel Baker 2016-12-04 20:27:35 +00:00
parent 082fa8f5ad
commit a1005ad7f9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php
View File

@ -1202,13 +1202,13 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
), ),
), ),
'date' => array( 'date' => array(
'description' => __( 'The date the object was published.' ), 'description' => __( "The date the object was published, in the site's timezone." ),
'type' => 'string', 'type' => 'string',
'format' => 'date-time', 'format' => 'date-time',
'context' => array( 'view', 'edit', 'embed' ), 'context' => array( 'view', 'edit', 'embed' ),
), ),
'date_gmt' => array( 'date_gmt' => array(
'description' => __( 'The date the object was published as GMT.' ), 'description' => __( 'The date the object was published, as GMT.' ),
'type' => 'string', 'type' => 'string',
'format' => 'date-time', 'format' => 'date-time',
'context' => array( 'view', 'edit' ), 'context' => array( 'view', 'edit' ),

4
wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
View File

@ -404,7 +404,7 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
'context' => array( 'view', 'edit', 'embed' ), 'context' => array( 'view', 'edit', 'embed' ),
), ),
'date' => array( 'date' => array(
'description' => __( 'The date the object was published.' ), 'description' => __( "The date the object was published, in the site's timezone." ),
'type' => 'string', 'type' => 'string',
'format' => 'date-time', 'format' => 'date-time',
'context' => array( 'view', 'edit', 'embed' ), 'context' => array( 'view', 'edit', 'embed' ),
@ -426,7 +426,7 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
'context' => array( 'view', 'edit', 'embed' ), 'context' => array( 'view', 'edit', 'embed' ),
), ),
'modified' => array( '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', 'type' => 'string',
'format' => 'date-time', 'format' => 'date-time',
'context' => array( 'view', 'edit' ), 'context' => array( 'view', 'edit' ),

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.