WordPress.org

Make WordPress Core

Ticket #9588: 9588.6.diff

File 9588.6.diff, 865 bytes (added by Denis-de-Bernardy, 9 years ago)
  • wp-admin/options-general.php

     
    159159<span>
    160160<?php if (get_option('timezone_string')) : ?>
    161161        <?php
    162         $now = localtime(time(),true);
     162        $now = localtime(strtotime(gmdate("Y-m-d H:i:s")),true);
    163163        if ($now['tm_isdst']) _e('This timezone is currently in daylight savings time.');
    164164        else _e('This timezone is currently in standard time.');
    165165        ?>
     
    168168        if (function_exists('timezone_transitions_get') && $tzstring) {
    169169                $dateTimeZoneSelected = new DateTimeZone($tzstring);
    170170                foreach (timezone_transitions_get($dateTimeZoneSelected) as $tr) {
    171                         if ($tr['ts'] > time()) {
     171                        if ($tr['ts'] > strtotime(gmdate("Y-m-d H:i:s"))) {
    172172                                $found = true;
    173173                                break;
    174174                        }