Changeset 16203

Timestamp:

11/05/2010 11:19:06 AM (16 years ago)

Author:

westi

Message:

Restore the functionality of some of the other timezone format modifiers in date_i18n props nbachiyski.

File:

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

trunk/wp-includes/functions.php

@@ -119 +119 @@
                 $dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
         }
+        $timezone_formats = array( 'P', 'I', 'O', 'T', 'Z', 'e' );
+        $timezone_formats_re = implode( '|', $timezone_formats );       
+        if ( preg_match( "/$timezone_formats_re/", $dateformatstring ) && wp_timezone_supported() ) {
+                $timezone_string = get_option( 'timezone_string' );
+                if ( $timezone_string ) {
+                        $timezone_object = timezone_open( $timezone_string );
+                        $date_object = date_create( null, $timezone_object );
+                        foreach( $timezone_formats as $timezone_format ) {
+                                if ( false !== strpos( $dateformatstring, $timezone_format ) ) {
+                                        $formatted = date_format( $date_object, $timezone_format );
+                                        $dateformatstring = ' '.$dateformatstring;
+                                        $dateformatstring = preg_replace( "/([^\\\])$timezone_format/", "\\1" . backslashit( $formatted ), $dateformatstring );
+                                        $dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
+                                }
+                        }                       
+                }
+        } 
         $j = @$datefunc( $dateformatstring, $i );
         // allow plugins to redo this entirely for languages with untypical grammars