<!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>[15585] trunk/wp-includes/general-template.php:
More efficient calendar queries.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15585">15585</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-09-07 04:22:56 +0000 (Tue, 07 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>More efficient calendar queries. fixes <a href="http://trac.wordpress.org/ticket/8351">#8351</a>. props vladimir_kolesnikov</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (15584 => 15585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-09-07 04:17:37 UTC (rev 15584)
+++ trunk/wp-includes/general-template.php 2010-09-07 04:22:56 UTC (rev 15585)
</span><span class="lines">@@ -1114,20 +1114,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $unixmonth = mktime(0, 0 , 0, $thismonth, 1, $thisyear);
</span><ins>+ $last_day = date('t', $unixmonth);
</ins><span class="cx">
</span><span class="cx"> // Get the next and previous month and year with at least one post
</span><del>- $previous = $wpdb->get_row("SELECT DISTINCT MONTH(post_date) AS month, YEAR(post_date) AS year
</del><ins>+ $previous = $wpdb->get_row("SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
</ins><span class="cx"> FROM $wpdb->posts
</span><span class="cx"> WHERE post_date < '$thisyear-$thismonth-01'
</span><span class="cx"> AND post_type = 'post' AND post_status = 'publish'
</span><span class="cx"> ORDER BY post_date DESC
</span><span class="cx"> LIMIT 1");
</span><del>- $next = $wpdb->get_row("SELECT DISTINCT MONTH(post_date) AS month, YEAR(post_date) AS year
</del><ins>+ $next = $wpdb->get_row("SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
</ins><span class="cx"> FROM $wpdb->posts
</span><del>- WHERE post_date > '$thisyear-$thismonth-01'
- AND MONTH( post_date ) != MONTH( '$thisyear-$thismonth-01' )
</del><ins>+ WHERE post_date > '$thisyear-$thismonth-{$last_day} 23:59:59'
</ins><span class="cx"> AND post_type = 'post' AND post_status = 'publish'
</span><del>- ORDER BY post_date ASC
</del><ins>+ ORDER BY post_date ASC
</ins><span class="cx"> LIMIT 1");
</span><span class="cx">
</span><span class="cx"> /* translators: Calendar caption: 1: month name, 2: 4-digit year */
</span><span class="lines">@@ -1179,10 +1179,9 @@
</span><span class="cx">
</span><span class="cx"> // Get days with posts
</span><span class="cx"> $dayswithposts = $wpdb->get_results("SELECT DISTINCT DAYOFMONTH(post_date)
</span><del>- FROM $wpdb->posts WHERE MONTH(post_date) = '$thismonth'
- AND YEAR(post_date) = '$thisyear'
</del><ins>+ FROM $wpdb->posts WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00'
</ins><span class="cx"> AND post_type = 'post' AND post_status = 'publish'
</span><del>- AND post_date < '" . current_time('mysql') . '\'', ARRAY_N);
</del><ins>+ AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59'", ARRAY_N);
</ins><span class="cx"> if ( $dayswithposts ) {
</span><span class="cx"> foreach ( (array) $dayswithposts as $daywith ) {
</span><span class="cx"> $daywithpost[] = $daywith[0];
</span><span class="lines">@@ -1199,9 +1198,8 @@
</span><span class="cx"> $ak_titles_for_day = array();
</span><span class="cx"> $ak_post_titles = $wpdb->get_results("SELECT ID, post_title, DAYOFMONTH(post_date) as dom "
</span><span class="cx"> ."FROM $wpdb->posts "
</span><del>- ."WHERE YEAR(post_date) = '$thisyear' "
- ."AND MONTH(post_date) = '$thismonth' "
- ."AND post_date < '".current_time('mysql')."' "
</del><ins>+ ."WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00' "
+ ."AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59' "
</ins><span class="cx"> ."AND post_type = 'post' AND post_status = 'publish'"
</span><span class="cx"> );
</span><span class="cx"> if ( $ak_post_titles ) {
</span></span></pre>
</div>
</div>
</body>
</html>