Changeset 43387

Timestamp:

07/03/2018 03:58:58 PM (6 years ago)

Author:

flixos90

Message:

Date/Time: Add support for gmt_offset to date_i18n().

Prior to this change, date_i18n() only supported the timezone_string option, causing incorrect timezones to appear in formatted dates on sites that still rely on the gmt_offset option.

Props Rarst.
Fixes #34835.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpunit/tests/date/dateI18n.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -137 +137 @@
                     $dateformatstring = preg_replace( "/([^\\\])$timezone_format/", "\\1" . backslashit( $formatted ), $dateformatstring );
                     $dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) - 1 );
+                }
+            }
+        } else {
+            $offset = get_option( 'gmt_offset' );
+            foreach ( $timezone_formats as $timezone_format ) {
+                if ( 'I' === $timezone_format ) {
+                    continue;
+                }
+
+                if ( false !== strpos( $dateformatstring, $timezone_format ) ) {
+                    if ( 'Z' === $timezone_format ) {
+                        $formatted = (string) ( $offset * HOUR_IN_SECONDS );
+                    } else {
+                        $prefix    = '';
+                        $hours     = (int) $offset;
+                        $separator = '';
+                        $minutes   = abs( ( $offset - $hours ) * 60 );
+
+                        if ( 'T' === $timezone_format ) {
+                            $prefix = 'GMT';
+                        } elseif ( 'e' === $timezone_format || 'P' === $timezone_format ) {
+                            $separator = ':';
+                        }
+
+                        $formatted = sprintf( '%s%+03d%s%02d', $prefix, $hours, $separator, $minutes );
+                    }
+
+                    $dateformatstring = ' ' . $dateformatstring;
+                    $dateformatstring = preg_replace( "/([^\\\])$timezone_format/", "\\1" . backslashit( $formatted ), $dateformatstring );
+                    $dateformatstring = substr( $dateformatstring, 1 );
                 }
             }

trunk/tests/phpunit/tests/date/dateI18n.php

@@ -68 +68 @@
         $this->assertEquals( '2012-12-01 00:00:00 CST -06:00 America/Regina', date_i18n( 'Y-m-d H:i:s T P e', strtotime( '2012-12-01 00:00:00' ) ) );
     }
+
+    /**
+     * @ticket 34835
+     */
+    public function test_gmt_offset_should_output_correct_timezone() {
+        $timezone_formats = 'P I O T Z e';
+        $timezone_string  = 'America/Regina';
+        $datetimezone     = new DateTimeZone( $timezone_string );
+        update_option( 'timezone_string', '' );
+        $offset = $datetimezone->getOffset( new DateTime() ) / 3600;
+        update_option( 'gmt_offset', $offset );
+        $datetime = new DateTime( 'now', $datetimezone );
+        $datetime = new DateTime( $datetime->format( 'P' ) );
+
+        $this->assertEquals( $datetime->format( $timezone_formats ), date_i18n( $timezone_formats ) );
+    }
 }