Changeset 9742 for trunk/wp-includes/functions.php

Timestamp:

11/17/2008 09:31:46 PM (16 years ago)

Author:

ryan

Message:

date_i18n() fixes. Props nbachiyski. fixes #8153

File:

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

trunk/wp-includes/functions.php

@@ -117 +117 @@
     $i = $unixtimestamp;
     // Sanity check for PHP 5.1.0-
-    if ( false === $i || intval($i) < 0 )
-        $i = time();
+    if ( false === $i || intval($i) < 0 ) {
+        if ( ! $gmt )
+            $i = current_time( 'timestamp' );
+        else
+            $i = time();
+        // we should not let date() interfere with our
+        // specially computed timestamp
+        $gmt = true;
+    }
+
+    $datefunc = $gmt? 'gmdate' : 'date';
 
     if ( ( !empty( $wp_locale->month ) ) && ( !empty( $wp_locale->weekday ) ) ) {
-        $datemonth = $wp_locale->get_month( date( 'm', $i ) );
+        $datemonth = $wp_locale->get_month( $datefunc( 'm', $i ) );
         $datemonth_abbrev = $wp_locale->get_month_abbrev( $datemonth );
-        $dateweekday = $wp_locale->get_weekday( date( 'w', $i ) );
+        $dateweekday = $wp_locale->get_weekday( $datefunc( 'w', $i ) );
         $dateweekday_abbrev = $wp_locale->get_weekday_abbrev( $dateweekday );
-        $datemeridiem = $wp_locale->get_meridiem( date( 'a', $i ) );
-        $datemeridiem_capital = $wp_locale->get_meridiem( date( 'A', $i ) );
+        $datemeridiem = $wp_locale->get_meridiem( $datefunc( 'a', $i ) );
+        $datemeridiem_capital = $wp_locale->get_meridiem( $datefunc( 'A', $i ) );
         $dateformatstring = ' '.$dateformatstring;
         $dateformatstring = preg_replace( "/([^\\\])D/", "\\1" . backslashit( $dateweekday_abbrev ), $dateformatstring );
@@ -137 +146 @@
         $dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
     }
-    $j = $gmt? @gmdate( $dateformatstring, $i ) : @date( $dateformatstring, $i );
+    $j = @$datefunc( $dateformatstring, $i );
     return $j;
 }