Changeset 42117

Timestamp:

11/06/2017 08:27:37 PM (7 years ago)

Author:

westonruter

Message:

Customize: Fall back to ISO date format for date/time control inputs if year, month, or day are missing from the date_format option.

Amends [42111].
Props dlh, westonruter.
Fixes #42394.

File:

• trunk/src/wp-includes/customize/class-wp-customize-date-time-control.php (modified) (1 diff)

trunk/src/wp-includes/customize/class-wp-customize-date-time-control.php

@@ -101 +101 @@
 
         $date_format = get_option( 'date_format' );
-        foreach ( array( 'Y', 'y', 'o' ) as $year_token ) {
-            $date_format = preg_replace( '/(?<!\\\\)' . $year_token . '/', '%1$s', $date_format );
-        }
-        foreach ( array( 'F', 'm', 'M', 'n' ) as $month_token ) {
-            $date_format = preg_replace( '/(?<!\\\\)' . $month_token . '/', '%2$s', $date_format );
-        }
-        foreach ( array( 'j', 'd' ) as $day_token ) {
-            $date_format = preg_replace( '/(?<!\\\\)' . $day_token . '/', '%3$s', $date_format );
+        $date_format = preg_replace( '/(?<!\\\\)[Yyo]/', '%1$s', $date_format );
+        $date_format = preg_replace( '/(?<!\\\\)[FmMn]/', '%2$s', $date_format );
+        $date_format = preg_replace( '/(?<!\\\\)[jd]/', '%3$s', $date_format );
+
+        // Fallback to ISO date format if year, month, or day are missing from the date format.
+        if ( 1 !== substr_count( $date_format, '%1$s' ) || 1 !== substr_count( $date_format, '%2$s' ) || 1 !== substr_count( $date_format, '%3$s' ) ) {
+            $date_format = '%1$s-%2$s-%3$s';
         }
         ?>