Changes from branches/2.8/wp-admin/options-general.php at r11598 to trunk/wp-admin/options-general.php at r11380

File:

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

trunk/wp-admin/options-general.php

@@ -158 +158 @@
 <br />
 <span>
-<?php if ($tzstring) : ?>
+<?php if (get_option('timezone_string')) : ?>
         <?php
         $now = localtime(time(),true);
@@ -166 +166 @@
         <br />
         <?php
-        if (function_exists('timezone_transitions_get')) {
+        if (function_exists('timezone_transitions_get') && $tzstring) {
                 $dateTimeZoneSelected = new DateTimeZone($tzstring);
                 foreach (timezone_transitions_get($dateTimeZoneSelected) as $tr) {
                         if ($tr['ts'] > time()) {
-                            $found = true;
+                                $found = true;
                                 break;
                         }
@@ -180 +180 @@
                                 __('Daylight savings 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'] ) );
+                        $tz = new DateTimeZone($tzstring);
+                        $d = new DateTime( "@{$tr['ts']}" );
+                        $d->setTimezone($tz);
+                        printf( $message, date_i18n(get_option('date_format').' '.get_option('time_format'), $d->format('U') ) );
                 } else {
                         _e('This timezone does not observe daylight savings time.');