<!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>[16303] trunk/wp-includes: Prevent stomping of global.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16303">16303</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-11-11 16:22:18 +0000 (Thu, 11 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent stomping of global. Props prettyboymp. fixes <a href="http://trac.wordpress.org/ticket/13945">#13945</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (16302 => 16303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-11-11 16:19:25 UTC (rev 16302)
+++ trunk/wp-includes/functions.php 2010-11-11 16:22:18 UTC (rev 16303)
</span><span class="lines">@@ -1344,8 +1344,8 @@
</span><span class="cx"> * @return int 1 when new day, 0 if not a new day.
</span><span class="cx"> */
</span><span class="cx"> function is_new_day() {
</span><del>- global $day, $previousday;
- if ( $day != $previousday )
</del><ins>+ global $currentday, $previousday;
+ if ( $currentday != $previousday )
</ins><span class="cx"> return 1;
</span><span class="cx"> else
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (16302 => 16303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-11-11 16:19:25 UTC (rev 16302)
+++ trunk/wp-includes/general-template.php 2010-11-11 16:22:18 UTC (rev 16303)
</span><span class="lines">@@ -1352,13 +1352,13 @@
</span><span class="cx"> * @return string|null Null if displaying, string if retrieving.
</span><span class="cx"> */
</span><span class="cx"> function the_date( $d = '', $before = '', $after = '', $echo = true ) {
</span><del>- global $day, $previousday;
</del><ins>+ global $currentday, $previousday;
</ins><span class="cx"> $the_date = '';
</span><del>- if ( $day != $previousday ) {
</del><ins>+ if ( $currentday != $previousday ) {
</ins><span class="cx"> $the_date .= $before;
</span><span class="cx"> $the_date .= get_the_date( $d );
</span><span class="cx"> $the_date .= $after;
</span><del>- $previousday = $day;
</del><ins>+ $previousday = $currentday;
</ins><span class="cx">
</span><span class="cx"> $the_date = apply_filters('the_date', $the_date, $d, $before, $after);
</span><span class="cx">
</span><span class="lines">@@ -1564,11 +1564,11 @@
</span><span class="cx"> function the_weekday_date($before='',$after='') {
</span><span class="cx"> global $wp_locale, $post, $day, $previousweekday;
</span><span class="cx"> $the_weekday_date = '';
</span><del>- if ( $day != $previousweekday ) {
</del><ins>+ if ( $currentday != $previousweekday ) {
</ins><span class="cx"> $the_weekday_date .= $before;
</span><span class="cx"> $the_weekday_date .= $wp_locale->get_weekday(mysql2date('w', $post->post_date, false));
</span><span class="cx"> $the_weekday_date .= $after;
</span><del>- $previousweekday = $day;
</del><ins>+ $previousweekday = $currentday;
</ins><span class="cx"> }
</span><span class="cx"> $the_weekday_date = apply_filters('the_weekday_date', $the_weekday_date, $before, $after);
</span><span class="cx"> echo $the_weekday_date;
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (16302 => 16303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-11-11 16:19:25 UTC (rev 16302)
+++ trunk/wp-includes/query.php 2010-11-11 16:22:18 UTC (rev 16303)
</span><span class="lines">@@ -3188,13 +3188,13 @@
</span><span class="cx"> * @return bool True when finished.
</span><span class="cx"> */
</span><span class="cx"> function setup_postdata($post) {
</span><del>- global $id, $authordata, $day, $currentmonth, $page, $pages, $multipage, $more, $numpages;
</del><ins>+ global $id, $authordata, $currentday, $currentmonth, $page, $pages, $multipage, $more, $numpages;
</ins><span class="cx">
</span><span class="cx"> $id = (int) $post->ID;
</span><span class="cx">
</span><span class="cx"> $authordata = get_userdata($post->post_author);
</span><span class="cx">
</span><del>- $day = mysql2date('d.m.y', $post->post_date, false);
</del><ins>+ $currentday = mysql2date('d.m.y', $post->post_date, false);
</ins><span class="cx"> $currentmonth = mysql2date('m', $post->post_date, false);
</span><span class="cx"> $numpages = 1;
</span><span class="cx"> $page = get_query_var('page');
</span></span></pre>
</div>
</div>
</body>
</html>