From d9d21cf3ffd7e8c56ab4454b2c99965cd80c76fc Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 25 Dec 2015 20:41:26 +0000 Subject: [PATCH] Docs: Correct `@return` type for `rest_parse_date()`. Props TimothyBlynJacobs. Fixes #35224. Built from https://develop.svn.wordpress.org/trunk@36086 git-svn-id: http://core.svn.wordpress.org/trunk@36051 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/rest-api.php | 4 ++-- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php index c0a492482b..0b2da7f763 100644 --- a/wp-includes/rest-api.php +++ b/wp-includes/rest-api.php @@ -601,14 +601,14 @@ function rest_cookie_collect_status() { } /** - * Parses an RFC3339 timestamp into a DateTime. + * Parses an RFC3339 time into a Unix timestamp. * * @since 4.4.0 * * @param string $date RFC3339 timestamp. * @param bool $force_utc Optional. Whether to force UTC timezone instead of using * the timestamp's timezone. Default false. - * @return DateTime DateTime instance. + * @return int Unix timestamp. */ function rest_parse_date( $date, $force_utc = false ) { if ( $force_utc ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 5f7f7bb60d..7db7c54bac 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-alpha-36085'; +$wp_version = '4.5-alpha-36086'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.