Commit 145d0efd authored by Jonathan Desrosiers's avatar Jonathan Desrosiers
Browse files

Date/Time: In `get_the_date()` and related functions, pass the original,... 

Date/Time: In `get_the_date()` and related functions, pass the original, unmodified `$format` value to the filters.

Additionally, simplify the `$format` argument checks for consistency with similar checks in `get_the_modified_date()` and `get_the_modified_time()`.

Follow-up to [48912].

Props Rarst.
Merges [48918] to the 5.5 branch.
See #51184.
Built from https://develop.svn.wordpress.org/branches/5.5@48922


git-svn-id: https://core.svn.wordpress.org/branches/5.5@48684 1a063a9b-81f0-0310-95a4-ce76da25c4cd
parent 750c0882

wp-includes/comment-template.php

+4 −8
Original line number Diff line number Diff line
@@ -552,11 +552,9 @@ 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 ( ! is_string( $format ) || '' === $format ) {

		$format = get_option( 'date_format' );

	}

	$_format = ! empty( $format ) ? $format : get_option( 'date_format' );



	$date = mysql2date( $format, $comment->comment_date );

	$date = mysql2date( $_format, $comment->comment_date );



	/**

	 * Filters the returned comment date.
@@ -1046,11 +1044,9 @@ function get_comment_time( $format = '', $gmt = false, $translate = true ) { 


	$comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;



	if ( ! is_string( $format ) || '' === $format ) {

		$format = get_option( 'time_format' );

	}

	$_format = ! empty( $format ) ? $format : get_option( 'time_format' );



	$date = mysql2date( $format, $comment_date, $translate );

	$date = mysql2date( $_format, $comment_date, $translate );



	/**

	 * Filters the returned comment time.

wp-includes/general-template.php

+10 −14
Original line number Diff line number Diff line
@@ -2525,11 +2525,9 @@ function get_the_date( $format = '', $post = null ) { 
		return false;

	}



	if ( ! is_string( $format ) || '' === $format ) {

		$format = get_option( 'date_format' );

	}

	$_format = ! empty( $format ) ? $format : get_option( 'date_format' );



	$the_date = get_post_time( $format, false, $post, true );

	$the_date = get_post_time( $_format, false, $post, true );



	/**

	 * Filters the date a post was published.
@@ -2595,10 +2593,10 @@ function get_the_modified_date( $format = '', $post = null ) { 
	if ( ! $post ) {

		// For backward compatibility, failures go through the filter below.

		$the_time = false;

	} elseif ( empty( $format ) ) {

		$the_time = get_post_modified_time( get_option( 'date_format' ), false, $post, true );

	} else {

		$the_time = get_post_modified_time( $format, false, $post, true );

		$_format = ! empty( $format ) ? $format : get_option( 'date_format' );



		$the_time = get_post_modified_time( $_format, false, $post, true );

	}



	/**
@@ -2654,11 +2652,9 @@ function get_the_time( $format = '', $post = null ) { 
		return false;

	}



	if ( ! is_string( $format ) || '' === $format ) {

		$format = get_option( 'time_format' );

	}

	$_format = ! empty( $format ) ? $format : get_option( 'time_format' );



	$the_time = get_post_time( $format, false, $post, true );

	$the_time = get_post_time( $_format, false, $post, true );



	/**

	 * Filters the time a post was written.
@@ -2843,10 +2839,10 @@ function get_the_modified_time( $format = '', $post = null ) { 
	if ( ! $post ) {

		// For backward compatibility, failures go through the filter below.

		$the_time = false;

	} elseif ( empty( $format ) ) {

		$the_time = get_post_modified_time( get_option( 'time_format' ), false, $post, true );

	} else {

		$the_time = get_post_modified_time( $format, false, $post, true );

		$_format = ! empty( $format ) ? $format : get_option( 'time_format' );



		$the_time = get_post_modified_time( $_format, false, $post, true );

	}



	/**

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-48921';

$wp_version = '5.5.1-RC1-48922';



/**

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