<!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>[27067] trunk: Fix an error in SQL generation when `perm` is set and an array is passed for `post_status`.</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/27067">27067</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-02-02 07:35:54 +0000 (Sun, 02 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix an error in SQL generation when `perm` is set and an array is passed for `post_status`. Adds unit test.
Props oso96_2000.
Fixes <a href="http://core.trac.wordpress.org/ticket/25523">#25523</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunktestsphpunittestsqueryresultsphp">trunk/tests/phpunit/tests/query/results.php</a></li>
<li><a href="#trunktestsphpunittestsqueryphp">trunk/tests/phpunit/tests/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/query.php (27066 => 27067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/query.php 2014-02-02 06:18:44 UTC (rev 27066)
+++ trunk/src/wp-includes/query.php 2014-02-02 07:35:54 UTC (rev 27067)
</span><span class="lines">@@ -2756,8 +2756,10 @@
</span><span class="cx"> foreach ( $statuswheres as $index => $statuswhere )
</span><span class="cx"> $statuswheres[$index] = "($statuswhere OR ($wpdb->posts.post_status = 'inherit' AND " . str_replace($wpdb->posts, 'p2', $statuswhere) . "))";
</span><span class="cx"> }
</span><del>- foreach ( $statuswheres as $statuswhere )
- $where .= " AND $statuswhere";
</del><ins>+ $where_status = implode( ' OR ', $statuswheres );
+ if ( ! empty( $where_status ) ) {
+ $where .= " AND ($where_status)";
+ }
</ins><span class="cx"> } elseif ( !$this->is_singular ) {
</span><span class="cx"> $where .= " AND ($wpdb->posts.post_status = 'publish'";
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryresultsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/query/results.php (27066 => 27067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/query/results.php 2014-02-02 06:18:44 UTC (rev 27066)
+++ trunk/tests/phpunit/tests/query/results.php 2014-02-02 07:35:54 UTC (rev 27067)
</span><span class="lines">@@ -533,4 +533,14 @@
</span><span class="cx"> $this->assertFalse( $this->q->is_month );
</span><span class="cx"> $this->assertFalse( $this->q->is_year );
</span><span class="cx"> }
</span><ins>+
+ function test_perm_with_status_array() {
+ global $wpdb;
+ $this->q->query( array( 'perm' => 'readable', 'post_status' => array( 'publish', 'private' ) ) );
+ $this->assertTrue( $this->q->have_posts() );
+ $this->assertContains( "(({$wpdb->posts}.post_status = 'publish') OR ({$wpdb->posts}.post_author = 0 AND ({$wpdb->posts}.post_status = 'private')))",
+ $this->q->request
+ );
+ $this->assertNotContains( "({$wpdb->posts}.post_status = 'publish') AND", $this->q->request );
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/query.php (27066 => 27067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/query.php 2014-02-02 06:18:44 UTC (rev 27066)
+++ trunk/tests/phpunit/tests/query.php 2014-02-02 07:35:54 UTC (rev 27067)
</span><span class="lines">@@ -76,6 +76,5 @@
</span><span class="cx"> $first_query->reset_postdata();
</span><span class="cx"> $this->assertEquals( get_the_ID(), $post_id );
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>