<!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>[31458] trunk: More careful type conversion in `WP_Query` `is_*()` methods.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31458">31458</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31458","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-02-14 02:08:46 +0000 (Sat, 14 Feb 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>More careful type conversion in `WP_Query` `is_*()` methods.
`is_array( 1, '1-foo' )` returns true, which means that `is_page( 1 )`
was returning true when on a page with the slug '1-foo'. We avoid this odd
behavior by casting the queried object ID to a string before testing against
the value passed to the conditional function.
This also helps to avoid a problem where an arbitrary value for `$page` would
cause `is_page( $page )` to return true if the query had been manipulated by
a plugin to show that the current page's ID is 0.
Props boonebgorges, r-a-y, nunomorgadinho, wonderboymusic, clifgriffin.
Fixes <a href="https://core.trac.wordpress.org/ticket/24674">#24674</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunktestsphpunittestsqueryconditionalsphp">trunk/tests/phpunit/tests/query/conditionals.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/query.php 2015-02-13 23:33:56 UTC (rev 31457)
+++ trunk/src/wp-includes/query.php 2015-02-14 02:08:46 UTC (rev 31458)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4077,7 +4077,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_obj = $this->get_queried_object();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $post_obj->ID, $attachment ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (string) $post_obj->ID, $attachment ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $post_obj->post_title, $attachment ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4109,7 +4109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author = (array) $author;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $author_obj->ID, $author ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (string) $author_obj->ID, $author ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( in_array( $author_obj->nickname, $author ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4141,7 +4141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $category = (array) $category;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $cat_obj->term_id, $category ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (string) $cat_obj->term_id, $category ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( in_array( $cat_obj->name, $category ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4173,7 +4173,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = (array) $tag;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $tag_obj->term_id, $tag ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (string) $tag_obj->term_id, $tag ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( in_array( $tag_obj->name, $tag ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4370,7 +4370,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $page = (array) $page;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $page_obj->ID, $page ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (string) $page_obj->ID, $page ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $page_obj->post_title, $page ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4463,7 +4463,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = (array) $post;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $post_obj->ID, $post ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (string) $post_obj->ID, $post ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $post_obj->post_title, $post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryconditionalsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/query/conditionals.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/conditionals.php 2015-02-13 23:33:56 UTC (rev 31457)
+++ trunk/tests/phpunit/tests/query/conditionals.php 2015-02-14 02:08:46 UTC (rev 31458)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -742,6 +742,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_single( 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 24674
+ */
+ public function test_is_single_with_slug_that_begins_with_a_number_that_clashes_with_another_post_id() {
+ $p1 = $this->factory->post->create();
+
+ $p2_name = $p1 . '-post';
+ $p2 = $this->factory->post->create( array(
+ 'slug' => $p2_name,
+ ) );
+
+ $this->go_to( "/?p=$p1" );
+
+ $q = $GLOBALS['wp_query'];
+
+ $this->assertTrue( $q->is_single() );
+ $this->assertTrue( $q->is_single( $p1 ) );
+ $this->assertFalse( $q->is_single( $p2_name ) );
+ $this->assertFalse( $q->is_single( $p2 ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_is_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( "/?page_id=$post_id" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -809,4 +830,133 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_attachment( $post->post_title ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_attachment( $post->post_name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 24674
+ */
+ public function test_is_attachment_with_slug_that_begins_with_a_number_that_clashes_with_a_page_ID() {
+ $p1 = $this->factory->post->create( array( 'post_type' => 'attachment' ) );
+
+ $p2_name = $p1 . '-attachment';
+ $p2 = $this->factory->post->create( array(
+ 'post_type' => 'attachment',
+ 'post_name' => $p2_name,
+ ) );
+
+ $this->go_to( "/?attachment_id=$p1" );
+
+ $q = $GLOBALS['wp_query'];
+
+ $this->assertTrue( $q->is_attachment() );
+ $this->assertTrue( $q->is_attachment( $p1 ) );
+ $this->assertFalse( $q->is_attachment( $p2_name ) );
+ $this->assertFalse( $q->is_attachment( $p2 ) );
+ }
+
+ /**
+ * @ticket 24674
+ */
+ public function test_is_author_with_nicename_that_begins_with_a_number_that_clashes_with_another_author_id() {
+ $u1 = $this->factory->user->create();
+
+ $u2_name = $u1 . '_user';
+ $u2 = $this->factory->user->create( array(
+ 'user_nicename' => $u2_name,
+ ) );
+
+ $this->go_to( "/?author=$u1" );
+
+ $q = $GLOBALS['wp_query'];
+
+ $this->assertTrue( $q->is_author() );
+ $this->assertTrue( $q->is_author( $u1 ) );
+ $this->assertFalse( $q->is_author( $u2_name ) );
+ $this->assertFalse( $q->is_author( $u2 ) );
+ }
+
+ /**
+ * @ticket 24674
+ */
+ public function test_is_category_with_slug_that_begins_with_a_number_that_clashes_with_another_category_id() {
+ $c1 = $this->factory->category->create();
+
+ $c2_name = $c1 . '-category';
+ $c2 = $this->factory->category->create( array(
+ 'slug' => $c2_name,
+ ) );
+
+ $this->go_to( "/?cat=$c1" );
+
+ $q = $GLOBALS['wp_query'];
+
+ $this->assertTrue( $q->is_category() );
+ $this->assertTrue( $q->is_category( $c1 ) );
+ $this->assertFalse( $q->is_category( $c2_name ) );
+ $this->assertFalse( $q->is_category( $c2 ) );
+ }
+
+ /**
+ * @ticket 24674
+ */
+ public function test_is_tag_with_slug_that_begins_with_a_number_that_clashes_with_another_tag_id() {
+ $t1 = $this->factory->tag->create();
+
+ $t2_name = $t1 . '-tag';
+ $t2 = $this->factory->tag->create( array(
+ 'slug' => $t2_name,
+ ) );
+
+ $this->go_to( "/?tag_id=$t1" );
+
+ $q = $GLOBALS['wp_query'];
+
+ $this->assertTrue( $q->is_tag() );
+ $this->assertTrue( $q->is_tag( $t1 ) );
+ $this->assertFalse( $q->is_tag( $t2_name ) );
+ $this->assertFalse( $q->is_tag( $t2 ) );
+ }
+
+ /**
+ * @ticket 24674
+ */
+ public function test_is_page_with_page_id_zero_and_random_page_slug() {
+ $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
+ $this->go_to( "/?page_id=$post_id" );
+
+ // override post ID to 0 temporarily for testing
+ $_id = $GLOBALS['wp_query']->post->ID;
+ $GLOBALS['wp_query']->post->ID = 0;
+
+ $post = get_queried_object();
+ $q = $GLOBALS['wp_query'];
+
+ $this->assertTrue( $q->is_page() );
+ $this->assertFalse( $q->is_page( 'sample-page' ) );
+ $this->assertFalse( $q->is_page( 'random-page-slug' ) );
+
+ // revert $wp_query global change
+ $GLOBALS['wp_query']->post->ID = $_id;
+ }
+
+ /**
+ * @ticket 24674
+ */
+ public function test_is_page_with_page_slug_that_begins_with_a_number_that_clashes_with_a_page_ID() {
+ $p1 = $this->factory->post->create( array( 'post_type' => 'page' ) );
+
+ $p2_name = $p1 . '-page';
+ $p2 = $this->factory->post->create( array(
+ 'post_type' => 'page',
+ 'post_name' => $p2_name,
+ ) );
+
+ $this->go_to( "/?page_id=$p1" );
+
+ $q = $GLOBALS['wp_query'];
+
+ $this->assertTrue( $q->is_page() );
+ $this->assertTrue( $q->is_page( $p1 ) );
+ $this->assertFalse( $q->is_page( $p2_name ) );
+ $this->assertFalse( $q->is_page( $p2 ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>