<!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>[14499] trunk/wp-includes: Fix start of week and SQL WEEK handling.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14499">14499</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-07 05:01:29 +0000 (Fri, 07 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix start of week and SQL WEEK handling. props mdawaffe, fixes <a href="http://trac.wordpress.org/ticket/10397">#10397</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 (14498 => 14499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-05-07 04:57:23 UTC (rev 14498)
+++ trunk/wp-includes/functions.php 2010-05-07 05:01:29 UTC (rev 14499)
</span><span class="lines">@@ -192,24 +192,15 @@
</span><span class="cx"> $md = substr( $mysqlstring, 5, 2 ); // Mysql string day
</span><span class="cx"> $day = mktime( 0, 0, 0, $md, $mm, $my ); // The timestamp for mysqlstring day.
</span><span class="cx"> $weekday = date( 'w', $day ); // The day of the week from the timestamp
</span><del>- $i = 86400; // One day
</del><span class="cx"> if ( !is_numeric($start_of_week) )
</span><span class="cx"> $start_of_week = get_option( 'start_of_week' );
</span><span class="cx">
</span><span class="cx"> if ( $weekday < $start_of_week )
</span><del>- $weekday = 7 - $start_of_week - $weekday;
</del><ins>+ $weekday += 7;
</ins><span class="cx">
</span><del>- while ( $weekday > $start_of_week ) {
- $weekday = date( 'w', $day );
- if ( $weekday < $start_of_week )
- $weekday = 7 - $start_of_week - $weekday;
-
- $day -= 86400;
- $i = 0;
- }
- $week['start'] = $day + 86400 - $i;
- $week['end'] = $week['start'] + 604799;
- return $week;
</del><ins>+ $start = $day - 86400 * ( $weekday - $start_of_week ); // The most recent week start day on or before $day
+ $end = $start + 604799; // $start + 7 days - 1 second
+ return compact( 'start', 'end' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -4168,4 +4159,28 @@
</span><span class="cx"> @header( 'X-Content-Type-Options: nosniff' );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Returns a MySQL expression for selecting the week number based on the start_of_week option.
+ *
+ * @internal
+ * @since 3.0.0
+ * @param string $column
+ * @return string
+ */
+function _wp_mysql_week( $column ) {
+ switch ( $start_of_week = (int) get_option( 'start_of_week' ) ) {
+ default :
+ case 0 :
+ return "WEEK( $column, 0 )";
+ case 1 :
+ return "WEEK( $column, 1 )";
+ case 2 :
+ case 3 :
+ case 4 :
+ case 5 :
+ case 6 :
+ return "WEEK( DATE_SUB( $column, INTERVAL $start_of_week DAY ), 0 )";
+ }
+}
+
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (14498 => 14499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-05-07 04:57:23 UTC (rev 14498)
+++ trunk/wp-includes/general-template.php 2010-05-07 05:01:29 UTC (rev 14499)
</span><span class="lines">@@ -965,8 +965,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } elseif ( 'weekly' == $type ) {
</span><del>- $start_of_week = get_option('start_of_week');
- $query = "SELECT DISTINCT WEEK(post_date, $start_of_week) AS `week`, YEAR(post_date) AS yr, DATE_FORMAT(post_date, '%Y-%m-%d') AS yyyymmdd, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY WEEK(post_date, $start_of_week), YEAR(post_date) ORDER BY post_date DESC $limit";
</del><ins>+ $week = _wp_mysql_week( '`post_date`' );
+ $query = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` DESC $limit";
</ins><span class="cx"> $key = md5($query);
</span><span class="cx"> $cache = wp_cache_get( 'wp_get_archives' , 'general');
</span><span class="cx"> if ( !isset( $cache[ $key ] ) ) {
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (14498 => 14499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-05-07 04:57:23 UTC (rev 14498)
+++ trunk/wp-includes/query.php 2010-05-07 05:01:29 UTC (rev 14499)
</span><span class="lines">@@ -1780,7 +1780,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $q['w'] )
</span><del>- $where .= " AND WEEK($wpdb->posts.post_date, 1)='" . $q['w'] . "'";
</del><ins>+ $where .= ' AND ' . _wp_mysql_week( "`$wpdb->posts`.`post_date`" ) . " = '" . $q['w'] . "'";
</ins><span class="cx">
</span><span class="cx"> if ( intval($q['comments_popup']) )
</span><span class="cx"> $q['p'] = absint($q['comments_popup']);
</span></span></pre>
</div>
</div>
</body>
</html>