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

Timestamp:

05/08/2011 05:14:36 PM (13 years ago)

Author:

westi

Message:

Restore the functionality of date_i18n to pre [17747] so that is works without a provided timestamp again. Fixes #17278.

File:

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

trunk/wp-includes/functions.php

@@ -85 +85 @@
     global $wp_locale;
     $i = $unixtimestamp;
+
+    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;
+    }
 
     // store original value for language with untypical grammars