<!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" />
<title>[28935] trunk: WP_Date_Query: The inclusive logic should include all times within the date range.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28935">28935</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2014-07-01 01:17:39 +0000 (Tue, 01 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WP_Date_Query: The inclusive logic should include all times within the date range.
props mboynes, oso96_2000, DrewAPicture.
fixes <a href="http://core.trac.wordpress.org/ticket/26653">#26653</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesdatephp">trunk/src/wp-includes/date.php</a></li>
<li><a href="#trunktestsphpunittestsquerydateQueryphp">trunk/tests/phpunit/tests/query/dateQuery.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesdatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/date.php (28934 => 28935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/date.php 2014-06-30 23:49:34 UTC (rev 28934)
+++ trunk/src/wp-includes/date.php 2014-07-01 01:17:39 UTC (rev 28935)
</span><span class="lines">@@ -48,6 +48,9 @@
</span><span class="cx"> /**
</span><span class="cx"> * Constructor.
</span><span class="cx"> *
</span><ins>+ * @since 3.7.0
+ * @since 4.0.0 The $inclusive logic was updated to include all times within the date range.
+ *
</ins><span class="cx"> * @param array $date_query {
</span><span class="cx"> * One or more associative arrays of date query parameters.
</span><span class="cx"> *
</span><span class="lines">@@ -235,19 +238,23 @@
</span><span class="cx">
</span><span class="cx"> $compare = $this->get_compare( $query );
</span><span class="cx">
</span><ins>+ $inclusive = ! empty( $query['inclusive'] );
+
+ // Assign greater- and less-than values.
</ins><span class="cx"> $lt = '<';
</span><span class="cx"> $gt = '>';
</span><del>- if ( ! empty( $query['inclusive'] ) ) {
</del><ins>+
+ if ( $inclusive ) {
</ins><span class="cx"> $lt .= '=';
</span><span class="cx"> $gt .= '=';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Range queries
</span><span class="cx"> if ( ! empty( $query['after'] ) )
</span><del>- $where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], true ) );
</del><ins>+ $where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
</ins><span class="cx">
</span><span class="cx"> if ( ! empty( $query['before'] ) )
</span><del>- $where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], false ) );
</del><ins>+ $where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
</ins><span class="cx">
</span><span class="cx"> // Specific value queries
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunittestsquerydateQueryphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/query/dateQuery.php (28934 => 28935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/query/dateQuery.php 2014-06-30 23:49:34 UTC (rev 28934)
+++ trunk/tests/phpunit/tests/query/dateQuery.php 2014-07-01 01:17:39 UTC (rev 28935)
</span><span class="lines">@@ -254,6 +254,37 @@
</span><span class="cx"> $this->assertEquals( $expected_dates, wp_list_pluck( $posts, 'post_date' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * @ticket 26653
+ */
+ public function test_date_query_inclusive_between_dates() {
+ $posts = $this->_get_query_result( array(
+ 'date_query' => array(
+ 'after' => array(
+ 'year' => 2007,
+ 'month' => 1
+ ),
+ 'before' => array(
+ 'year' => 2008,
+ 'month' => 12
+ ),
+ 'inclusive' => true
+ ),
+ ) );
+
+
+ $expected_dates = array(
+ '2007-01-22 03:49:21',
+ '2007-05-16 17:32:22',
+ '2007-09-24 07:17:23',
+ '2008-03-29 09:04:25',
+ '2008-07-15 11:32:26',
+ '2008-12-10 13:06:27',
+ );
+
+ $this->assertEquals( $expected_dates, wp_list_pluck( $posts, 'post_date' ) );
+ }
+
</ins><span class="cx"> public function test_date_query_year_expecting_results() {
</span><span class="cx"> $posts = $this->_get_query_result( array(
</span><span class="cx"> 'date_query' => array(
</span></span></pre>
</div>
</div>
</body>
</html>