From aec28121b3ad4ff21fbcac5d76ef6a8820127d7f Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 31 Aug 2020 15:58:04 +0000
Subject: [PATCH] Date/Time: Make sure `get_the_date()` and related functions
 return correct time if the format was specified as `false`.

Technically, the `$format` argument should always be a string, but passing `false` used to work before [47808], so this restores backward compatibility.

The list of affected functions:
* `get_the_date()`
* `get_the_time()`
* `get_comment_date()`
* `get_comment_time()`

Props wittich, Rarst, akabarikalpesh, SergeyBiryukov.
Fixes #51184.
Built from https://develop.svn.wordpress.org/trunk@48912


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

diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 9a2d62c586..a048d3870c 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -552,12 +552,12 @@ function get_comment_class( $class = '', $comment_id = null, $post_id = null ) {
 function get_comment_date( $format = '', $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
 
-	if ( '' === $format ) {
-		$date = mysql2date( get_option( 'date_format' ), $comment->comment_date );
-	} else {
-		$date = mysql2date( $format, $comment->comment_date );
+	if ( ! is_string( $format ) || '' === $format ) {
+		$format = get_option( 'date_format' );
 	}
 
+	$date = mysql2date( $format, $comment->comment_date );
+
 	/**
 	 * Filters the returned comment date.
 	 *
@@ -1046,12 +1046,12 @@ function get_comment_time( $format = '', $gmt = false, $translate = true ) {
 
 	$comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
 
-	if ( '' === $format ) {
-		$date = mysql2date( get_option( 'time_format' ), $comment_date, $translate );
-	} else {
-		$date = mysql2date( $format, $comment_date, $translate );
+	if ( ! is_string( $format ) || '' === $format ) {
+		$format = get_option( 'time_format' );
 	}
 
+	$date = mysql2date( $format, $comment_date, $translate );
+
 	/**
 	 * Filters the returned comment time.
 	 *
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 094e4a4062..89748f1968 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -2525,12 +2525,12 @@ function get_the_date( $format = '', $post = null ) {
 		return false;
 	}
 
-	if ( '' === $format ) {
-		$the_date = get_post_time( get_option( 'date_format' ), false, $post, true );
-	} else {
-		$the_date = get_post_time( $format, false, $post, true );
+	if ( ! is_string( $format ) || '' === $format ) {
+		$format = get_option( 'date_format' );
 	}
 
+	$the_date = get_post_time( $format, false, $post, true );
+
 	/**
 	 * Filters the date a post was published.
 	 *
@@ -2654,12 +2654,12 @@ function get_the_time( $format = '', $post = null ) {
 		return false;
 	}
 
-	if ( '' === $format ) {
-		$the_time = get_post_time( get_option( 'time_format' ), false, $post, true );
-	} else {
-		$the_time = get_post_time( $format, false, $post, true );
+	if ( ! is_string( $format ) || '' === $format ) {
+		$format = get_option( 'time_format' );
 	}
 
+	$the_time = get_post_time( $format, false, $post, true );
+
 	/**
 	 * Filters the time a post was written.
 	 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7301479dfb..fe385288bd 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-alpha-48911';
+$wp_version = '5.6-alpha-48912';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.