Changeset 38804

Timestamp:

10/17/2016 08:09:11 AM (8 years ago)

Author:

swissspidy

Message:

Date/Time: Remove some legacy logic in date_i18n().

Since there's no difference between using date() and gmdate() in WordPress, we can simply use the former in date_i18n() to reduce its complexity.

Adds tests.

Props jdgrimes for initial patch.
Fixes #37910.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (3 diffs)
• tests/phpunit/tests/date/dateI18n.php (added)

trunk/src/wp-includes/functions.php

@@ -92 +92 @@
 
     if ( false === $i ) {
-        if ( ! $gmt )
-            $i = current_time( 'timestamp' );
-        else
-            $i = time();
-        // we should not let date() interfere with our
-        // specially computed timestamp
-        $gmt = true;
+        $i = current_time( 'timestamp', $gmt );
     }
 
@@ -107 +101 @@
     $req_format = $dateformatstring;
 
-    $datefunc = $gmt? 'gmdate' : 'date';
-
     if ( ( !empty( $wp_locale->month ) ) && ( !empty( $wp_locale->weekday ) ) ) {
-        $datemonth = $wp_locale->get_month( $datefunc( 'm', $i ) );
+        $datemonth = $wp_locale->get_month( date( 'm', $i ) );
         $datemonth_abbrev = $wp_locale->get_month_abbrev( $datemonth );
-        $dateweekday = $wp_locale->get_weekday( $datefunc( 'w', $i ) );
+        $dateweekday = $wp_locale->get_weekday( date( 'w', $i ) );
         $dateweekday_abbrev = $wp_locale->get_weekday_abbrev( $dateweekday );
-        $datemeridiem = $wp_locale->get_meridiem( $datefunc( 'a', $i ) );
-        $datemeridiem_capital = $wp_locale->get_meridiem( $datefunc( 'A', $i ) );
+        $datemeridiem = $wp_locale->get_meridiem( date( 'a', $i ) );
+        $datemeridiem_capital = $wp_locale->get_meridiem( date( 'A', $i ) );
         $dateformatstring = ' '.$dateformatstring;
         $dateformatstring = preg_replace( "/([^\\\])D/", "\\1" . backslashit( $dateweekday_abbrev ), $dateformatstring );
@@ -143 +135 @@
         }
     }
-    $j = @$datefunc( $dateformatstring, $i );
+    $j = @date( $dateformatstring, $i );
 
     /**