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

Timestamp:

07/05/2016 09:42:06 PM (10 years ago)

Author:

SergeyBiryukov

Message:

I18N: Adjust the regex in wp_maybe_decline_date() to avoid \w and \b, as they don't work with Unicode characters correctly in PHP 5.3.3 and earlier versions.

See [37975] for unit tests.

See #36790.

File:

• trunk/src/wp-includes/functions.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -183 +183 @@
         if ( 'on' === _x( 'off', 'decline months names: on or off' ) ) {
                 // Match a format like 'j F Y' or 'j. F'
-                if ( @preg_match( '#^\d{1,2}\.? \w+#u', $date ) ) {
-                        $months = $wp_locale->month;
+                if ( @preg_match( '#^\d{1,2}\.? [^\d ]+#u', $date ) ) {
+                        $months          = $wp_locale->month;
+                        $months_genitive = $wp_locale->month_genitive;
 
                         foreach ( $months as $key => $month ) {
-                                $months[ $key ] = '#\b' . $month . '\b#u';
+                                $months[ $key ] = '# ' . $month . '( |$)#u';
                         }
 
-                        $date = preg_replace( $months, $wp_locale->month_genitive, $date );
+                        foreach ( $months_genitive as $key => $month ) {
+                                $months_genitive[ $key ] = ' ' . $month . '$1';
+                        }
+
+                        $date = preg_replace( $months, $months_genitive, $date );
                 }
         }