Changeset 13702

Timestamp:

03/15/2010 01:57:36 AM (15 years ago)

Author:

ryan

Message:

Fix DST/Standard transition display.

File:

• trunk/wp-admin/options-general.php (modified) (3 diffs)

trunk/wp-admin/options-general.php

@@ -192 +192 @@
 <span>
     <?php
+    // Set TZ so localtime works.
+    date_default_timezone_set($tzstring);
     $now = localtime(time(), true);
     if ( $now['tm_isdst'] )
@@ -203 +205 @@
         $found = false;
         $date_time_zone_selected = new DateTimeZone($tzstring);
+        $tz_offset = timezone_offset_get($date_time_zone_selected, date_create());
+        $right_now = time();
         foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
-            if ( $tr['ts'] > time() ) {
+            if ( $tr['ts'] > $right_now ) {
                 $found = true;
                 break;
@@ -215 +219 @@
                 __('Daylight saving time begins on: <code>%s</code>.') :
                 __('Standard time begins  on: <code>%s</code>.');
-            printf( $message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] ) );
+            // Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
+            printf( $message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] + ($tz_offset - $tr['offset']) ) );
         } else {
             _e('This timezone does not observe daylight saving time.');
         }
     }
+    // Set back to UTC.
+    date_default_timezone_set('UTC');
     ?>
     </span>