<!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>[28252] trunk: In `WP_Date_Query::get_sql_for_subquery()`, don't parse duplicate parameters - only parse one of `w` and `week` or `month` and `monthnum`.</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/28252">28252</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-04 23:06:07 +0000 (Sun, 04 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>In `WP_Date_Query::get_sql_for_subquery()`, don't parse duplicate parameters - only parse one of `w` and `week` or `month` and `monthnum`.
Adds unit tests.
Props oso96_2000, ChriCo.
Fixes <a href="http://core.trac.wordpress.org/ticket/25835">#25835</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 (28251 => 28252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/date.php 2014-05-04 22:20:47 UTC (rev 28251)
+++ trunk/src/wp-includes/date.php 2014-05-04 23:06:07 UTC (rev 28252)
</span><span class="lines">@@ -256,16 +256,12 @@
</span><span class="cx">
</span><span class="cx"> if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) )
</span><span class="cx"> $where_parts[] = "MONTH( $column ) $compare $value";
</span><del>-
- // Legacy
- if ( isset( $query['monthnum'] ) && $value = $this->build_value( $compare, $query['monthnum'] ) )
</del><ins>+ else if ( isset( $query['monthnum'] ) && $value = $this->build_value( $compare, $query['monthnum'] ) )
</ins><span class="cx"> $where_parts[] = "MONTH( $column ) $compare $value";
</span><span class="cx">
</span><span class="cx"> if ( isset( $query['week'] ) && false !== ( $value = $this->build_value( $compare, $query['week'] ) ) )
</span><span class="cx"> $where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
</span><del>-
- // Legacy
- if ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) )
</del><ins>+ else if ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) )
</ins><span class="cx"> $where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
</span><span class="cx">
</span><span class="cx"> if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) )
</span></span></pre></div>
<a id="trunktestsphpunittestsquerydateQueryphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/query/dateQuery.php (28251 => 28252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/query/dateQuery.php 2014-05-04 22:20:47 UTC (rev 28251)
+++ trunk/tests/phpunit/tests/query/dateQuery.php 2014-05-04 23:06:07 UTC (rev 28252)
</span><span class="lines">@@ -555,4 +555,49 @@
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( $expected_dates, wp_list_pluck( $posts, 'post_date' ) );
</span><span class="cx"> }
</span><ins>+
+ public function test_date_params_monthnum_m_duplicate() {
+ $posts = $this->_get_query_result( array(
+ 'date_query' => array(
+ 'month' => 5,
+ 'monthnum' => 9
+ ),
+ ) );
+
+ $expected_dates = array(
+ '1972-05-24 14:53:45',
+ '2003-05-27 22:45:07',
+ '2004-05-22 12:34:12',
+ '2007-05-16 17:32:22',
+ '2025-05-20 10:13:01',
+ );
+
+ $this->assertEquals( $expected_dates, wp_list_pluck( $posts, 'post_date' ) );
+
+ $this->assertContains( "AND ( ( MONTH( post_date ) = 5 ) ) AND", $this->q->request );
+
+ $this->assertNotContains( "AND ( ( MONTH( post_date ) = 5 AND MONTH( post_date ) = 9 ) ) AND", $this->q->request );
+ }
+
+ public function test_date_params_week_w_duplicate() {
+ $posts = $this->_get_query_result( array(
+ 'date_query' => array(
+ 'week' => 21,
+ 'w' => 22
+ ),
+ ) );
+
+ $expected_dates = array(
+ '1972-05-24 14:53:45',
+ '2004-05-22 12:34:12',
+ '2025-05-20 10:13:01',
+ );
+
+
+ $this->assertEquals( $expected_dates, wp_list_pluck( $posts, 'post_date' ) );
+
+ $this->assertContains( "AND ( ( WEEK( post_date, 1 ) = 21 ) ) AND", $this->q->request );
+
+ $this->assertNotContains( "AND ( ( WEEK( post_date, 1 ) = 21 AND WEEK( post_date, 1 ) = 22 ) ) AND", $this->q->request );
+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>