<!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>[29039] trunk: Add support for a full path parameter to `is_page()` and `is_single()`.</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/29039">29039</a></dd>
<dt>Author</dt> <dd>johnbillion</dd>
<dt>Date</dt> <dd>2014-07-09 16:03:17 +0000 (Wed, 09 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add support for a full path parameter to `is_page()` and `is_single()`. Props Jesper800, engelen, johnbillion. Fixes <a href="http://core.trac.wordpress.org/ticket/16802">#16802</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>Modified: trunk/src/wp-includes/query.php (29038 => 29039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/query.php  2014-07-08 22:55:51 UTC (rev 29038)
+++ trunk/src/wp-includes/query.php     2014-07-09 16:03:17 UTC (rev 29039)
</span><span class="lines">@@ -4311,7 +4311,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @since 3.1.0
</span><span class="cx">   *
</span><del>-        * @param mixed $page Page ID, title, slug, or array of such.
</del><ins>+         * @param mixed $page Page ID, title, slug, path, or array of such.
</ins><span class="cx">    * @return bool
</span><span class="cx">   */
</span><span class="cx">  public function is_page( $page = '' ) {
</span><span class="lines">@@ -4325,13 +4325,25 @@
</span><span class="cx"> 
</span><span class="cx">          $page = (array) $page;
</span><span class="cx"> 
</span><del>-               if ( in_array( $page_obj->ID, $page ) )
</del><ins>+                if ( in_array( $page_obj->ID, $page ) ) {
</ins><span class="cx">                   return true;
</span><del>-               elseif ( in_array( $page_obj->post_title, $page ) )
</del><ins>+                } elseif ( in_array( $page_obj->post_title, $page ) ) {
</ins><span class="cx">                   return true;
</span><del>-               else if ( in_array( $page_obj->post_name, $page ) )
</del><ins>+                } else if ( in_array( $page_obj->post_name, $page ) ) {
</ins><span class="cx">                   return true;
</span><ins>+               } else {
+                       foreach ( $page as $pagepath ) {
+                               if ( ! strpos( $pagepath, '/' ) ) {
+                                       continue;
+                               }
+                               $pagepath_obj = get_page_by_path( $pagepath );
</ins><span class="cx"> 
</span><ins>+                               if ( $pagepath_obj && ( $pagepath_obj->ID == $page_obj->ID ) ) {
+                                       return true;
+                               }
+                       }
+               }
+
</ins><span class="cx">           return false;
</span><span class="cx">  }
</span><span class="cx"> 
</span><span class="lines">@@ -4392,7 +4404,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @since 3.1.0
</span><span class="cx">   *
</span><del>-        * @param mixed $post Post ID, title, slug, or array of such.
</del><ins>+         * @param mixed $post Post ID, title, slug, path, or array of such.
</ins><span class="cx">    * @return bool
</span><span class="cx">   */
</span><span class="cx">  public function is_single( $post = '' ) {
</span><span class="lines">@@ -4406,13 +4418,24 @@
</span><span class="cx"> 
</span><span class="cx">          $post = (array) $post;
</span><span class="cx"> 
</span><del>-               if ( in_array( $post_obj->ID, $post ) )
</del><ins>+                if ( in_array( $post_obj->ID, $post ) ) {
</ins><span class="cx">                   return true;
</span><del>-               elseif ( in_array( $post_obj->post_title, $post ) )
</del><ins>+                } elseif ( in_array( $post_obj->post_title, $post ) ) {
</ins><span class="cx">                   return true;
</span><del>-               elseif ( in_array( $post_obj->post_name, $post ) )
</del><ins>+                } elseif ( in_array( $post_obj->post_name, $post ) ) {
</ins><span class="cx">                   return true;
</span><ins>+               } else {
+                       foreach ( $post as $postpath ) {
+                               if ( ! strpos( $postpath, '/' ) ) {
+                                       continue;
+                               }
+                               $postpath_obj = get_page_by_path( $postpath, OBJECT, $post_obj->post_type );
</ins><span class="cx"> 
</span><ins>+                               if ( $postpath_obj && ( $postpath_obj->ID == $post_obj->ID ) ) {
+                                       return true;
+                               }
+                       }
+               }
</ins><span class="cx">           return false;
</span><span class="cx">  }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryconditionalsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/query/conditionals.php (29038 => 29039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/query/conditionals.php 2014-07-08 22:55:51 UTC (rev 29038)
+++ trunk/tests/phpunit/tests/query/conditionals.php    2014-07-09 16:03:17 UTC (rev 29039)
</span><span class="lines">@@ -692,6 +692,53 @@
</span><span class="cx">          $this->assertTrue( is_single( $post->post_name ) );
</span><span class="cx">  }
</span><span class="cx"> 
</span><ins>+       /**
+        * @ticket 16802
+        */
+       function test_is_single_with_parent() {
+               // Use custom hierarchical post type
+               $post_type = 'test_hierarchical';
+
+               register_post_type( $post_type, array(
+                       'hierarchical' => true,
+                       'rewrite'      => true,
+                       'has_archive'  => true,
+                       'public'       => true
+               ) );
+
+               // Create parent and child posts
+               $parent_id = $this->factory->post->create( array(
+                       'post_type' => $post_type,
+                       'post_name' => 'foo'
+               ) );
+
+               $post_id = $this->factory->post->create( array(
+                       'post_type'   => $post_type,
+                       'post_name'   => 'bar',
+                       'post_parent' => $parent_id
+               ) );
+
+               // Tests
+               $this->go_to( "/?p=$post_id&post_type=$post_type" );
+
+               $post = get_queried_object();
+               $q = $GLOBALS['wp_query'];
+
+               $this->assertTrue( is_single() );
+               $this->assertFalse( $q->is_page );
+               $this->assertTrue( $q->is_single );
+               $this->assertFalse( $q->is_attachment );
+               $this->assertTrue( is_single( $post ) );
+               $this->assertTrue( is_single( $post->ID ) );
+               $this->assertTrue( is_single( $post->post_title ) );
+               $this->assertTrue( is_single( $post->post_name ) );
+               $this->assertTrue( is_single( 'foo/bar' ) );
+               $this->assertFalse( is_single( $parent_id ) );
+               $this->assertFalse( is_single( 'foo/bar/baz' ) );
+               $this->assertFalse( is_single( 'bar/bar' ) );
+               $this->assertFalse( is_single( 'foo' ) );
+       }
+
</ins><span class="cx">   function test_is_page() {
</span><span class="cx">          $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
</span><span class="cx">          $this->go_to( "/?page_id=$post_id" );
</span><span class="lines">@@ -709,6 +756,39 @@
</span><span class="cx">          $this->assertTrue( is_page( $post->post_name ) );
</span><span class="cx">  }
</span><span class="cx"> 
</span><ins>+       /**
+        * @ticket 16802
+        */
+       function test_is_page_with_parent() {
+               $parent_id = $this->factory->post->create( array(
+                       'post_type' => 'page',
+                       'post_name' => 'foo',
+               ) );
+               $post_id = $this->factory->post->create( array(
+                       'post_type'   => 'page',
+                       'post_name'   => 'bar',
+                       'post_parent' => $parent_id,
+               ) );
+               $this->go_to( "/?page_id=$post_id" );
+
+               $post = get_queried_object();
+               $q = $GLOBALS['wp_query'];
+
+               $this->assertTrue( is_page() );
+               $this->assertFalse( $q->is_single );
+               $this->assertTrue( $q->is_page );
+               $this->assertFalse( $q->is_attachment );
+               $this->assertTrue( is_page( $post ) );
+               $this->assertTrue( is_page( $post->ID ) );
+               $this->assertTrue( is_page( $post->post_title ) );
+               $this->assertTrue( is_page( $post->post_name ) );
+               $this->assertTrue( is_page( 'foo/bar' ) );
+               $this->assertFalse( is_page( $parent_id ) );
+               $this->assertFalse( is_page( 'foo/bar/baz' ) );
+               $this->assertFalse( is_page( 'bar/bar' ) );
+               $this->assertFalse( is_page( 'foo' ) );
+       }
+
</ins><span class="cx">   function test_is_attachment() {
</span><span class="cx">          $post_id = $this->factory->post->create( array( 'post_type' => 'attachment' ) );
</span><span class="cx">          $this->go_to( "/?attachment_id=$post_id" );
</span></span></pre>
</div>
</div>

</body>
</html>