Commit 750c0882 authored by Jonathan Desrosiers's avatar Jonathan Desrosiers
Browse files

Date/Time: Make sure `get_the_date()` and related functions return correct... 

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.
Merges [48912] to the 5.5 branch.
Fixes #51184.
Built from https://develop.svn.wordpress.org/branches/5.5@48921


git-svn-id: https://core.svn.wordpress.org/branches/5.5@48683 1a063a9b-81f0-0310-95a4-ce76da25c4cd
parent 0eee2ad0

wp-includes/comment-template.php

+8 −8
Original line number Diff line number Diff line
@@ -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.

	 *

wp-includes/general-template.php

+8 −8
Original line number Diff line number Diff line
@@ -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.

	 *

wp-includes/version.php

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 *

 * @global string $wp_version

 */

$wp_version = '5.5.1-RC1-48920';

$wp_version = '5.5.1-RC1-48921';



/**

 * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.