From 3e2e0c52e6c9363068abc169fe048346bd8baa12 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Wed, 20 Apr 2016 15:55:28 +0000
Subject: [PATCH] Docs: Clarify the return descriptions for `get_the_time()`,
 `get_post_time()`, and `get_post_modified_time()` to specify when an integer
 in the form of a Unix timestamp should be expected.

See [30674]. See #30989.

Built from https://develop.svn.wordpress.org/trunk@37265


git-svn-id: http://core.svn.wordpress.org/trunk@37231 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/general-template.php | 6 +++---
 wp-includes/version.php          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index aaff39ef20..92a162ba1a 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -2303,7 +2303,7 @@ function the_time( $d = '' ) {
  *                          was written. Either 'G', 'U', or php date format defaults
  *                          to the value specified in the time_format option. Default empty.
  * @param int|WP_Post $post WP_Post object or ID. Default is global $post object.
- * @return false|string Formatted date string or Unix timestamp. False on failure.
+ * @return string|int|false Formatted date string or Unix timestamp if `$id` is 'U' or 'G'. False on failure.
  */
 function get_the_time( $d = '', $post = null ) {
 	$post = get_post($post);
@@ -2341,7 +2341,7 @@ function get_the_time( $d = '', $post = null ) {
  * @param bool        $gmt       Optional. Whether to retrieve the GMT time. Default false.
  * @param int|WP_Post $post      WP_Post object or ID. Default is global $post object.
  * @param bool        $translate Whether to translate the time string. Default false.
- * @return false|string|int Formatted date string or Unix timestamp. False on failure.
+ * @return string|int|false Formatted date string or Unix timestamp if `$id` is 'U' or 'G'. False on failure.
  */
 function get_post_time( $d = 'U', $gmt = false, $post = null, $translate = false ) {
 	$post = get_post($post);
@@ -2428,7 +2428,7 @@ function get_the_modified_time($d = '') {
  * @param bool        $gmt       Optional. Whether to retrieve the GMT time. Default false.
  * @param int|WP_Post $post      WP_Post object or ID. Default is global $post object.
  * @param bool        $translate Whether to translate the time string. Default false.
- * @return false|string Formatted date string or Unix timestamp. False on failure.
+ * @return string|int|false Formatted date string or Unix timestamp if `$id` is 'U' or 'G'. False on failure.
  */
 function get_post_modified_time( $d = 'U', $gmt = false, $post = null, $translate = false ) {
 	$post = get_post($post);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 136abdaf6a..91e1684d50 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37264';
+$wp_version = '4.6-alpha-37265';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.