Changeset 47078 for trunk/src/wp-includes/functions.php

Timestamp:

01/17/2020 01:10:57 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: Pass the date format to wp_maybe_decline_date().

This ensures that the function has enough context to determine the necessity of replacing the month name with the correct form in locales that require it.

Props SergeyBiryukov, Rarst.
Fixes #48934.

File:

• trunk/src/wp-includes/functions.php (modified) (4 diffs)

trunk/src/wp-includes/functions.php

@@ -287 +287 @@
 
                 $date = $datetime->format( $new_format );
-                $date = wp_maybe_decline_date( $date );
+                $date = wp_maybe_decline_date( $date, $format );
         }
 
@@ -313 +313 @@
  *
  * @since 4.4.0
+ * @since 5.4.0 The `$format` parameter was added.
  *
  * @global WP_Locale $wp_locale WordPress date and time locale object.
  *
- * @param string $date Formatted date string.
+ * @param string $date   Formatted date string.
+ * @param string $format Optional. Date format to check. Default empty string.
  * @return string The date, declined if locale specifies it.
  */
-function wp_maybe_decline_date( $date ) {
+function wp_maybe_decline_date( $date, $format = '' ) {
         global $wp_locale;
 
@@ -340 +342 @@
                  * and decline the month.
                  */
-                if ( preg_match( '#\b\d{1,2}\.? [^\d ]+\b#u', $date ) ) {
+                if ( $format ) {
+                        $decline = preg_match( '#[dj]\.? F#', $format );
+                } else {
+                        // If the format is not passed, try to guess it from the date string.
+                        $decline = preg_match( '#\b\d{1,2}\.? [^\d ]+\b#u', $date );
+                }
+
+                if ( $decline ) {
                         foreach ( $months as $key => $month ) {
                                 $months[ $key ] = '# ' . preg_quote( $month, '#' ) . '\b#u';
@@ -356 +365 @@
                  * and change it to declined 'j F'.
                  */
-                if ( preg_match( '#\b[^\d ]+ \d{1,2}(st|nd|rd|th)?\b#u', trim( $date ) ) ) {
+                if ( $format ) {
+                        $decline = preg_match( '#F [dj]#', $format );
+                } else {
+                        // If the format is not passed, try to guess it from the date string.
+                        $decline = preg_match( '#\b[^\d ]+ \d{1,2}(st|nd|rd|th)?\b#u', trim( $date ) );
+                }
+
+                if ( $decline ) {
                         foreach ( $months as $key => $month ) {
                                 $months[ $key ] = '#\b' . preg_quote( $month, '#' ) . ' (\d{1,2})(st|nd|rd|th)?\b#u';