Changeset 45914

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.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (2 diffs)
• tests/phpunit/tests/date/currentTime.php (modified) (1 diff)
• tests/phpunit/tests/date/dateI18n.php (modified) (2 diffs)
• tests/phpunit/tests/date/theDate.php (modified) (1 diff)
• tests/phpunit/tests/date/wpDate.php (added)
• tests/phpunit/tests/date/wpTimezone.php (modified) (1 diff)

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;
     }
 

trunk/tests/phpunit/tests/date/currentTime.php

@@ -5 +5 @@
  * @group datetime
  */
-class Tests_Date_CurrentTime extends WP_UnitTestCase {
+class Tests_Date_Current_Time extends WP_UnitTestCase {
 
     /**

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

@@ -6 +6 @@
  */
 class Tests_Date_I18n extends WP_UnitTestCase {
+
+    /**
+     * @ticket 28636
+     */
+    public function test_should_return_current_time_on_invalid_timestamp() {
+        $timezone = 'Europe/Kiev';
+        update_option( 'timezone_string', $timezone );
+
+        $datetime     = new DateTime( 'now', new DateTimeZone( $timezone ) );
+        $wp_timestamp = $datetime->getTimestamp() + $datetime->getOffset();
+
+        $this->assertEquals( $wp_timestamp, date_i18n( 'U', 'invalid' ), '', 5 );
+    }
+
     public function test_should_format_date() {
         $this->assertEquals( strtotime( gmdate( 'Y-m-d H:i:s' ) ), strtotime( date_i18n( 'Y-m-d H:i:s' ) ), 'The dates should be equal', 2 );
@@ -75 +89 @@
         $offset = $datetimezone->getOffset( new DateTime() ) / 3600;
         update_option( 'gmt_offset', $offset );
+
         $datetime = new DateTime( 'now', $datetimezone );
         $datetime = new DateTime( $datetime->format( 'P' ) );

trunk/tests/phpunit/tests/date/theDate.php

@@ -5 +5 @@
  * @group datetime
  */
-class Tests_Date_TheDate extends WP_UnitTestCase {
+class Tests_Date_The_Date extends WP_UnitTestCase {
 
     /** @var array $hooks_called Count of hooks called. */

trunk/tests/phpunit/tests/date/wpTimezone.php

@@ -5 +5 @@
  * @group datetime
  */
-class Tests_WP_Timezone extends WP_UnitTestCase {
+class Tests_Date_WP_Timezone extends WP_UnitTestCase {
 
     /**