<!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>[12590] trunk: Use current_time() to calculate current time.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12590">12590</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-30 17:56:09 +0000 (Wed, 30 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use current_time() to calculate current time. Props filosofo. fixes <a href="http://trac.wordpress.org/ticket/10915">#10915</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (12589 => 12590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2009-12-30 17:19:27 UTC (rev 12589)
+++ trunk/wp-admin/includes/template.php 2009-12-30 17:56:09 UTC (rev 12590)
</span><span class="lines">@@ -2610,7 +2610,7 @@
</span><span class="cx">
</span><span class="cx"> // echo '<label for="timestamp" style="display: block;"><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> '.__( 'Edit timestamp' ).'</label><br />';
</span><span class="cx">
</span><del>- $time_adj = time() + (get_option( 'gmt_offset' ) * 3600 );
</del><ins>+ $time_adj = current_time('timestamp');
</ins><span class="cx"> $post_date = ($for_post) ? $post->post_date : $comment->comment_date;
</span><span class="cx"> $jj = ($edit) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj );
</span><span class="cx"> $mm = ($edit) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj );
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (12589 => 12590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2009-12-30 17:19:27 UTC (rev 12589)
+++ trunk/wp-includes/general-template.php 2009-12-30 17:56:09 UTC (rev 12590)
</span><span class="lines">@@ -1123,7 +1123,7 @@
</span><span class="cx"> echo "\n\t</tr>\n\t<tr>\n\t\t";
</span><span class="cx"> $newrow = false;
</span><span class="cx">
</span><del>- if ( $day == gmdate('j', (time() + (get_option('gmt_offset') * 3600))) && $thismonth == gmdate('m', time()+(get_option('gmt_offset') * 3600)) && $thisyear == gmdate('Y', time()+(get_option('gmt_offset') * 3600)) )
</del><ins>+ if ( $day == gmdate('j', current_time('timestamp')) && $thismonth == gmdate('m', current_time('timestamp')) && $thisyear == gmdate('Y', current_time('timestamp')) )
</ins><span class="cx"> echo '<td id="today">';
</span><span class="cx"> else
</span><span class="cx"> echo '<td>';
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (12589 => 12590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2009-12-30 17:19:27 UTC (rev 12589)
+++ trunk/wp-includes/link-template.php 2009-12-30 17:56:09 UTC (rev 12590)
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx"> function get_year_link($year) {
</span><span class="cx"> global $wp_rewrite;
</span><span class="cx"> if ( !$year )
</span><del>- $year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
</del><ins>+ $year = gmdate('Y', current_time('timestamp'));
</ins><span class="cx"> $yearlink = $wp_rewrite->get_year_permastruct();
</span><span class="cx"> if ( !empty($yearlink) ) {
</span><span class="cx"> $yearlink = str_replace('%year%', $year, $yearlink);
</span><span class="lines">@@ -311,9 +311,9 @@
</span><span class="cx"> function get_month_link($year, $month) {
</span><span class="cx"> global $wp_rewrite;
</span><span class="cx"> if ( !$year )
</span><del>- $year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
</del><ins>+ $year = gmdate('Y', current_time('timestamp'));
</ins><span class="cx"> if ( !$month )
</span><del>- $month = gmdate('m', time()+(get_option('gmt_offset') * 3600));
</del><ins>+ $month = gmdate('m', current_time('timestamp'));
</ins><span class="cx"> $monthlink = $wp_rewrite->get_month_permastruct();
</span><span class="cx"> if ( !empty($monthlink) ) {
</span><span class="cx"> $monthlink = str_replace('%year%', $year, $monthlink);
</span><span class="lines">@@ -337,11 +337,11 @@
</span><span class="cx"> function get_day_link($year, $month, $day) {
</span><span class="cx"> global $wp_rewrite;
</span><span class="cx"> if ( !$year )
</span><del>- $year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
</del><ins>+ $year = gmdate('Y', current_time('timestamp'));
</ins><span class="cx"> if ( !$month )
</span><del>- $month = gmdate('m', time()+(get_option('gmt_offset') * 3600));
</del><ins>+ $month = gmdate('m', current_time('timestamp'));
</ins><span class="cx"> if ( !$day )
</span><del>- $day = gmdate('j', time()+(get_option('gmt_offset') * 3600));
</del><ins>+ $day = gmdate('j', current_time('timestamp'));
</ins><span class="cx">
</span><span class="cx"> $daylink = $wp_rewrite->get_day_permastruct();
</span><span class="cx"> if ( !empty($daylink) ) {
</span></span></pre>
</div>
</div>
</body>
</html>