Changeset 48921 for branches/5.5/src/wp-includes/general-template.php

Timestamp:

08/31/2020 06:56:22 PM (6 years ago)

Author:

desrosj

Message:

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.

Location:

branches/5.5

Files:

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

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

@@ -2526 +2526 @@
         }
 
-        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 );
 
         /**
@@ -2655 +2655 @@
         }
 
-        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 );
 
         /**