Changeset 43434

Timestamp:

07/05/2018 11:10:01 PM (7 years ago)

Author:

johnbillion

Message:

Date/Time: Add support for the c and r shorthand formats in date_i18n().

Props Rarst, pbearne

Fixes #20973

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

@@ -107 +107 @@
      */
     $req_format = $dateformatstring;
+
+    $dateformatstring = preg_replace( "/(?<!\\\\)c/", DATE_W3C, $dateformatstring );
+    $dateformatstring = preg_replace( "/(?<!\\\\)r/", DATE_RFC2822, $dateformatstring );
 
     if ( ( ! empty( $wp_locale->month ) ) && ( ! empty( $wp_locale->weekday ) ) ) {

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

@@ -84 +84 @@
         $this->assertEquals( $datetime->format( $timezone_formats ), date_i18n( $timezone_formats ) );
     }
+
+    /**
+     * @dataProvider data_formats
+     * @ticket 20973
+     */
+    public function test_date_i18n_handles_shorthand_formats( $short, $full ) {
+        $this->assertEquals( date_i18n( $full ), date_i18n( $short ) );
+        $this->assertEquals( $short, date_i18n( '\\' . $short ) );
+    }
+
+    public function data_formats() {
+        return array(
+            array(
+                'c',
+                'Y-m-d\TH:i:sP',
+            ),
+            array(
+                'r',
+                'D, d M Y H:i:s O',
+            ),
+        );
+    }
 }