<!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>[27395] trunk: Add has_password and post_password query variables to WP_Query.</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/27395">27395</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-03-04 07:44:28 +0000 (Tue, 04 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add has_password and post_password query variables to WP_Query.
* has_password true means posts with passwords, false means posts without.
* post_password can query for posts with a particular password.
props wonderboymusic, robmiller.
fixes <a href="http://core.trac.wordpress.org/ticket/20308">#20308</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/query.php (27394 => 27395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/query.php 2014-03-04 07:10:46 UTC (rev 27394)
+++ trunk/src/wp-includes/query.php 2014-03-04 07:44:28 UTC (rev 27395)
</span><span class="lines">@@ -2702,6 +2702,15 @@
</span><span class="cx"> $post_type_cap = $post_type;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( isset( $q['post_password'] ) ) {
+ $where .= $wpdb->prepare( " AND $wpdb->posts.post_password = %s", $q['post_password'] );
+ if ( empty( $q['perm'] ) ) {
+ $q['perm'] = 'readable';
+ }
+ } elseif ( isset( $q['has_password'] ) ) {
+ $where .= sprintf( " AND $wpdb->posts.post_password %s ''", $q['has_password'] ? '!=' : '=' );
+ }
+
</ins><span class="cx"> if ( 'any' == $post_type ) {
</span><span class="cx"> $in_search_post_types = get_post_types( array('exclude_from_search' => false) );
</span><span class="cx"> if ( empty( $in_search_post_types ) )
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryresultsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/query/results.php (27394 => 27395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/query/results.php 2014-03-04 07:10:46 UTC (rev 27394)
+++ trunk/tests/phpunit/tests/query/results.php 2014-03-04 07:44:28 UTC (rev 27395)
</span><span class="lines">@@ -543,4 +543,44 @@
</span><span class="cx"> );
</span><span class="cx"> $this->assertNotContains( "({$wpdb->posts}.post_status = 'publish') AND", $this->q->request );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @ticket 20308
+ */
+ function test_post_password() {
+ $one = (string) $this->factory->post->create( array( 'post_password' => '' ) );
+ $two = (string) $this->factory->post->create( array( 'post_password' => 'burrito' ) );
+ $three = (string) $this->factory->post->create( array( 'post_password' => 'burrito' ) );
+
+ $args = array( 'post__in' => array( $one, $two, $three ), 'fields' => 'ids' );
+
+ $result1 = $this->q->query( array_merge( $args, array( 'has_password' => true ) ) );
+ $this->assertEqualSets( array( $two, $three ), $result1 );
+ $result2 = $this->q->query( array_merge( $args, array( 'has_password' => false ) ) );
+ $this->assertEquals( array( $one ), $result2 );
+
+ // This is equivalent to not passing it at all.
+ $result3 = $this->q->query( array_merge( $args, array( 'has_password' => null ) ) );
+ $this->assertEqualSets( array( $one, $two, $three ), $result3 );
+
+ // If both arguments are passed, only post_password is considered.
+ $result4 = $this->q->query( array_merge( $args, array( 'has_password' => true, 'post_password' => '' ) ) );
+ $this->assertEquals( array( $one ), $result4 );
+ $result5 = $this->q->query( array_merge( $args, array( 'has_password' => false, 'post_password' => '' ) ) );
+ $this->assertEquals( array( $one ), $result5 );
+ $result6 = $this->q->query( array_merge( $args, array( 'has_password' => null, 'post_password' => '' ) ) );
+ $this->assertEquals( array( $one ), $result6 );
+
+ $result7 = $this->q->query( array_merge( $args, array( 'has_password' => true, 'post_password' => 'burrito' ) ) );
+ $this->assertEqualSets( array( $two, $three ), $result7 );
+ $result8 = $this->q->query( array_merge( $args, array( 'has_password' => false, 'post_password' => 'burrito' ) ) );
+ $this->assertEqualSets( array( $two, $three ), $result8 );
+ $result9 = $this->q->query( array_merge( $args, array( 'has_password' => null, 'post_password' => 'burrito' ) ) );
+ $this->assertEqualSets( array( $two, $three ), $result9 );
+
+ $result10 = $this->q->query( array_merge( $args, array( 'post_password' => '' ) ) );
+ $this->assertEquals( array( $one ), $result10 );
+ $result11 = $this->q->query( array_merge( $args, array( 'post_password' => 'burrito' ) ) );
+ $this->assertEqualSets( array( $two, $three ), $result11 );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>