<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13702] trunk/wp-admin/options-general.php: Fix DST/
Standard transition display.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13702">13702</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-03-15 01:57:36 +0000 (Mon, 15 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix DST/Standard transition display.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (13701 => 13702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2010-03-14 12:12:23 UTC (rev 13701)
+++ trunk/wp-admin/options-general.php 2010-03-15 01:57:36 UTC (rev 13702)
</span><span class="lines">@@ -191,6 +191,8 @@
</span><span class="cx"> <br />
</span><span class="cx"> <span>
</span><span class="cx"> <?php
</span><ins>+ // Set TZ so localtime works.
+ date_default_timezone_set($tzstring);
</ins><span class="cx"> $now = localtime(time(), true);
</span><span class="cx"> if ( $now['tm_isdst'] )
</span><span class="cx"> _e('This timezone is currently in daylight saving time.');
</span><span class="lines">@@ -202,8 +204,10 @@
</span><span class="cx"> if ( function_exists('timezone_transitions_get') ) {
</span><span class="cx"> $found = false;
</span><span class="cx"> $date_time_zone_selected = new DateTimeZone($tzstring);
</span><ins>+ $tz_offset = timezone_offset_get($date_time_zone_selected, date_create());
+ $right_now = time();
</ins><span class="cx"> foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
</span><del>- if ( $tr['ts'] > time() ) {
</del><ins>+ if ( $tr['ts'] > $right_now ) {
</ins><span class="cx"> $found = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -214,11 +218,14 @@
</span><span class="cx"> $message = $tr['isdst'] ?
</span><span class="cx"> __('Daylight saving time begins on: <code>%s</code>.') :
</span><span class="cx"> __('Standard time begins on: <code>%s</code>.');
</span><del>- printf( $message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] ) );
</del><ins>+ // 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']) ) );
</ins><span class="cx"> } else {
</span><span class="cx"> _e('This timezone does not observe daylight saving time.');
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ // Set back to UTC.
+ date_default_timezone_set('UTC');
</ins><span class="cx"> ?>
</span><span class="cx"> </span>
</span><span class="cx"> <?php endif; ?>
</span></span></pre>
</div>
</div>
</body>
</html>