Changeset 46577

Timestamp:

10/25/2019 11:03:13 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: Make sure date_i18n() correctly handles zero timestamp after [45901].

Props soulseekah, gravityview, Rarst.
Reviewed by azaozz, SergeyBiryukov.
Fixes #28636.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpunit/tests/date/dateI18n.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -177 +177 @@
     if ( 'U' === $format ) {
         $date = $timestamp;
-    } elseif ( $gmt && ! $timestamp_with_offset ) { // Current time in UTC.
+    } elseif ( $gmt && false === $timestamp_with_offset ) { // Current time in UTC.
         $date = wp_date( $format, null, new DateTimeZone( 'UTC' ) );
-    } elseif ( ! $timestamp_with_offset ) { // Current time in site's timezone.
+    } elseif ( false === $timestamp_with_offset ) { // Current time in site's timezone.
         $date = wp_date( $format );
     } else {

trunk/tests/phpunit/tests/date/dateI18n.php

@@ -18 +18 @@
 
         $this->assertEquals( $wp_timestamp, date_i18n( 'U', 'invalid' ), '', 5 );
+    }
+
+    /**
+     * @ticket 28636
+     */
+    public function test_should_handle_zero_timestamp() {
+        $timezone = 'Europe/Kiev';
+        update_option( 'timezone_string', $timezone );
+
+        $datetime = DateTimeImmutable::createFromFormat(
+            'Y-m-d H:i:s',
+            '1970-01-01 00:00:00',
+            new DateTimeZone( $timezone )
+        );
+        $rfc3339  = $datetime->format( DATE_RFC3339 );
+
+        $this->assertEquals( 0, date_i18n( 'U', 0 ) );
+        $this->assertEquals( $rfc3339, date_i18n( DATE_RFC3339, 0 ) );
     }