Changeset 46569

Timestamp:

10/22/2019 05:29:02 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: Make sure wp_date() does not unnecessarily escape localized numbers, but keeps localized slashes.

Props Rarst, tmatsuur, remcotolsma, peterwilsoncc.
Reviewed by peterwilsoncc.
Fixes #48319.

Location:

trunk

Files:

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

trunk/src/wp-includes/functions.php

@@ -255 +255 @@
             switch ( $format[ $i ] ) {
                 case 'D':
-                    $new_format .= backslashit( $wp_locale->get_weekday_abbrev( $weekday ) );
+                    $new_format .= addcslashes( $wp_locale->get_weekday_abbrev( $weekday ), '\\A..Za..z' );
                     break;
                 case 'F':
-                    $new_format .= backslashit( $month );
+                    $new_format .= addcslashes( $month, '\\A..Za..z' );
                     break;
                 case 'l':
-                    $new_format .= backslashit( $weekday );
+                    $new_format .= addcslashes( $weekday, '\\A..Za..z' );
                     break;
                 case 'M':
-                    $new_format .= backslashit( $wp_locale->get_month_abbrev( $month ) );
+                    $new_format .= addcslashes( $wp_locale->get_month_abbrev( $month ), '\\A..Za..z' );
                     break;
                 case 'a':
-                    $new_format .= backslashit( $wp_locale->get_meridiem( $datetime->format( 'a' ) ) );
+                    $new_format .= addcslashes( $wp_locale->get_meridiem( $datetime->format( 'a' ) ), '\\A..Za..z' );
                     break;
                 case 'A':
-                    $new_format .= backslashit( $wp_locale->get_meridiem( $datetime->format( 'A' ) ) );
+                    $new_format .= addcslashes( $wp_locale->get_meridiem( $datetime->format( 'A' ) ), '\\A..Za..z' );
                     break;
                 case '\\':

trunk/tests/phpunit/tests/date/wpDate.php

@@ -7 +7 @@
 class Tests_Date_WP_Date extends WP_UnitTestCase {
 
+    /** @var WP_Locale */
+    private $wp_locale_original;
+
+    public function setUp() {
+        global $wp_locale;
+
+        parent::setUp();
+
+        $this->wp_locale_original = clone $wp_locale;
+    }
+
+    public function tearDown() {
+        global $wp_locale;
+
+        $wp_locale = $this->wp_locale_original;
+
+        parent::tearDown();
+    }
+
     /**
      * @ticket 28636
@@ -13 +32 @@
         $this->assertFalse( wp_date( DATE_RFC3339, 'invalid' ) );
     }
+
+    /**
+     * @ticket 48319
+     */
+    public function test_should_not_escape_localized_numbers() {
+        global $wp_locale;
+
+        $wp_locale->month = array( 10 => '10月' );
+
+        $utc      = new DateTimeZone( 'UTC' );
+        $datetime = new DateTimeImmutable( '2019-10-17', $utc );
+
+        $this->assertEquals( '10月', wp_date( 'F', $datetime->getTimestamp(), $utc ) );
+    }
+
+    /**
+     * @ticket 48319
+     */
+    public function test_should_keep_localized_slashes() {
+        global $wp_locale;
+
+        $string           = 'A \ B';
+        $wp_locale->month = array( 10 => $string );
+
+        $utc      = new DateTimeZone( 'UTC' );
+        $datetime = new DateTimeImmutable( '2019-10-17', $utc );
+
+        $this->assertEquals( $string, wp_date( 'F', $datetime->getTimestamp(), $utc ) );
+    }
 }