Ticket #9588: 9588.6.diff

wp-admin/options-general.php

@@ -159 +159 @@
 <span>
 <?php if (get_option('timezone_string')) : ?>
         <?php
-        $now = localtime(time(),true);
+        $now = localtime(strtotime(gmdate("Y-m-d H:i:s")),true);
         if ($now['tm_isdst']) _e('This timezone is currently in daylight savings time.');
         else _e('This timezone is currently in standard time.');
         ?>
@@ -168 +168 @@
         if (function_exists('timezone_transitions_get') && $tzstring) {
                 $dateTimeZoneSelected = new DateTimeZone($tzstring);
                 foreach (timezone_transitions_get($dateTimeZoneSelected) as $tr) {
-                        if ($tr['ts'] > time()) {
+                        if ($tr['ts'] > strtotime(gmdate("Y-m-d H:i:s"))) {
                                 $found = true;
                                 break;
                         }