Changeset 45914 for trunk/src/wp-includes/functions.php

Timestamp:

08/29/2019 11:17:30 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: Restore the previous behavior of date_i18n() where invalid input would result in current time.

Make wp_date() return false on invalid timestamp input, for consistency with upstream PHP date() function.

Props Rarst.
Fixes #28636.

File:

• trunk/src/wp-includes/functions.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -164 +164 @@
  */
 function date_i18n( $format, $timestamp_with_offset = false, $gmt = false ) {
+    $timestamp = $timestamp_with_offset;
+
     // If timestamp is omitted it should be current time (summed with offset, unless `$gmt` is true).
-    $timestamp = $timestamp_with_offset ? $timestamp_with_offset : current_time( 'timestamp', $gmt );
+    if ( ! is_numeric( $timestamp ) ) {
+        $timestamp = current_time( 'timestamp', $gmt );
+    }
 
     /*
@@ -219 +223 @@
  * @param DateTimeZone $timezone  Optional. Timezone to output result in. Defaults to timezone
  *                                from site settings.
- * @return string The date, translated if locale specifies it.
+ * @return string|false The date, translated if locale specifies it. False on invalid timestamp input.
  */
 function wp_date( $format, $timestamp = null, $timezone = null ) {
     global $wp_locale;
 
-    if ( ! $timestamp ) {
+    if ( null === $timestamp ) {
         $timestamp = time();
+    } elseif ( ! is_numeric( $timestamp ) ) {
+        return false;
     }