Ticket #28636: localized-time-invalid-input.patch

tests/phpunit/tests/date/wpDate.php

@@ +1 @@
+<?php
+
+/**
+ * @group date
+ * @group datetime
+ */
+class Tests_Date_Wp_Date extends WP_UnitTestCase {
+
+        public function test_should_return_false_on_invalid_timestamp() {
+
+                $this->assertFalse( wp_date( DATE_RFC3339, 'invalid' ) );
+        }
+}

src/wp-includes/functions.php

@@ -163 +163 @@
  * @return string The date, translated if locale specifies it.
  */
 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 );
+        }
 
         /*
          * This is a legacy implementation quirk that the returned timestamp is also with offset.
@@ -218 +223 @@
  * @param int          $timestamp Optional. Unix timestamp. Defaults to current time.
  * @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;
         }
 
         if ( ! $timezone ) {

tests/phpunit/tests/date/dateI18n.php

@@ -5 +5 @@
  * @group datetime
  */
 class Tests_Date_I18n extends WP_UnitTestCase {
+
+        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 );
         }