Changeset 48922

Timestamp:

08/31/2020 06:58:04 PM (4 years ago)

Author:

desrosj

Message:

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.

Location:

branches/5.5

Files:

• . (modified) (1 prop)
• src/wp-includes/comment-template.php (modified) (2 diffs)
• src/wp-includes/general-template.php (modified) (4 diffs)

branches/5.5/src/wp-includes/comment-template.php

@@ -553 +553 @@
     $comment = get_comment( $comment_ID );
 
-    if ( ! is_string( $format ) || '' === $format ) {
-        $format = get_option( 'date_format' );
-    }
-
-    $date = mysql2date( $format, $comment->comment_date );
+    $_format = ! empty( $format ) ? $format : get_option( 'date_format' );
+
+    $date = mysql2date( $_format, $comment->comment_date );
 
     /**
@@ -1047 +1045 @@
     $comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
 
-    if ( ! is_string( $format ) || '' === $format ) {
-        $format = get_option( 'time_format' );
-    }
-
-    $date = mysql2date( $format, $comment_date, $translate );
+    $_format = ! empty( $format ) ? $format : get_option( 'time_format' );
+
+    $date = mysql2date( $_format, $comment_date, $translate );
 
     /**

branches/5.5/src/wp-includes/general-template.php

@@ -2526 +2526 @@
     }
 
-    if ( ! is_string( $format ) || '' === $format ) {
-        $format = get_option( 'date_format' );
-    }
-
-    $the_date = get_post_time( $format, false, $post, true );
+    $_format = ! empty( $format ) ? $format : get_option( 'date_format' );
+
+    $the_date = get_post_time( $_format, false, $post, true );
 
     /**
@@ -2596 +2594 @@
         // 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 );
     }
 
@@ -2655 +2653 @@
     }
 
-    if ( ! is_string( $format ) || '' === $format ) {
-        $format = get_option( 'time_format' );
-    }
-
-    $the_time = get_post_time( $format, false, $post, true );
+    $_format = ! empty( $format ) ? $format : get_option( 'time_format' );
+
+    $the_time = get_post_time( $_format, false, $post, true );
 
     /**
@@ -2844 +2840 @@
         // 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 );
     }