Ticket #16802: 16802.diff

src/wp-includes/query.php

@@ -4311 +4311 @@
          *
          * @since 3.1.0
          *
-         * @param mixed $page Page ID, title, slug, or array of such.
+         * @param mixed $page Page ID, title, slug, path, or array of such.
          * @return bool
          */
         public function is_page( $page = '' ) {
@@ -4325 +4325 @@
 
                 $page = (array) $page;
 
-                if ( in_array( $page_obj->ID, $page ) )
+                if ( in_array( $page_obj->ID, $page ) ) {
                         return true;
-                elseif ( in_array( $page_obj->post_title, $page ) )
+                } elseif ( in_array( $page_obj->post_title, $page ) ) {
                         return true;
-                else if ( in_array( $page_obj->post_name, $page ) )
+                } else if ( in_array( $page_obj->post_name, $page ) ) {
                         return true;
+                } else {
+                        foreach ( $page as $pagepath ) {
+                                if ( ! strpos( $pagepath, '/' ) ) {
+                                        continue;
+                                }
+                                $pagepath_obj = get_page_by_path( $pagepath );
+
+                                if ( $pagepath_obj && ( $pagepath_obj->ID == $page_obj->ID ) ) {
+                                        return true;
+                                }
+                        }
+                }
 
                 return false;
         }
@@ -4392 +4404 @@
          *
          * @since 3.1.0
          *
-         * @param mixed $post Post ID, title, slug, or array of such.
+         * @param mixed $post Post ID, title, slug, path, or array of such.
          * @return bool
          */
         public function is_single( $post = '' ) {
@@ -4406 +4418 @@
 
                 $post = (array) $post;
 
-                if ( in_array( $post_obj->ID, $post ) )
+                if ( in_array( $post_obj->ID, $post ) ) {
                         return true;
-                elseif ( in_array( $post_obj->post_title, $post ) )
+                } elseif ( in_array( $post_obj->post_title, $post ) ) {
                         return true;
-                elseif ( in_array( $post_obj->post_name, $post ) )
+                } elseif ( in_array( $post_obj->post_name, $post ) ) {
                         return true;
-
+                } else {
+                        foreach ( $post as $postpath ) {
+                                if ( ! strpos( $postpath, '/' ) ) {
+                                        continue;
+                                }
+                                $postpath_obj = get_page_by_path( $postpath, OBJECT, $post_obj->post_type );
+
+                                if ( $postpath_obj && ( $postpath_obj->ID == $post_obj->ID ) ) {
+                                        return true;
+                                }
+                        }
+                }
                 return false;
         }
 

tests/phpunit/tests/query/conditionals.php

@@ -709 +709 @@
                 $this->assertTrue( is_page( $post->post_name ) );
         }
 
+        /**
+         * @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' ) );
+        }
+
         function test_is_attachment() {
                 $post_id = $this->factory->post->create( array( 'post_type' => 'attachment' ) );
                 $this->go_to( "/?attachment_id=$post_id" );