Ticket #15667: 15667.2.diff

src/wp-includes/class-wp-walker.php

@@ -281 +281 @@
                  * When none of the elements is top level.
                  * Assume the first one must be root of the sub elements.
                  */
-                if ( empty($top_level_elements) ) {
+                if ( empty( $top_level_elements ) && $max_depth !== 1  ) {
 
                         $first = array_slice( $elements, 0, 1 );
                         $root = $first[0];

tests/phpunit/tests/post/getPages.php

@@ -132 +132 @@
                 $this->assertEquals( $inc, $exc_result );
         }
 
+        /*
+         * @ticket 15667
+         */
+        function test_get_pages_exclude_with_children() {
+
+                $page_1       = $this->factory->post->create( array( 'post_type' => 'page' ) );
+                $page_1_child = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+                $page_2       = $this->factory->post->create( array( 'post_type' => 'page' ) );
+                $page_2_child = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_2 ) );
+
+                // If hierarchical is false get_pages returns the children even though the parents are excluded
+                $pages = get_pages( 'hierarchical=0&exclude=' . implode( ',', array( $page_1, $page_2 ) ) );
+                $this->assertEqualSets( array( $page_1_child, $page_2_child ), wp_list_pluck( $pages, 'ID' ) );
+
+                // If hierarchical is true get_pages doesn't return the children if the parents are excluded
+                $pages = get_pages( 'hierarchical=1&exclude=' . implode( ',', array( $page_1, $page_2 ) ) );
+                $this->assertEmpty( $pages );
+
+        }
+
+        /*
+         * @ticket 15667
+         */
+        function test_get_pages_exclude_tree() {
+
+                $page_1       = $this->factory->post->create( array( 'post_type' => 'page' ) );
+                $page_1_child = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+                $page_2       = $this->factory->post->create( array( 'post_type' => 'page' ) );
+                $page_2_child = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_2 ) );
+
+                // exclude_tree always excludes the children regardless of what hierarchical is set to
+                $pages = get_pages( 'hierarchical=0&exclude_tree=' . $page_1 );
+                $this->assertEqualSets( array( $page_2, $page_2_child ), wp_list_pluck( $pages, 'ID' ) );
+                $pages = get_pages( 'hierarchical=1&exclude_tree=' . $page_1 );
+                $this->assertEqualSets( array( $page_2, $page_2_child ), wp_list_pluck( $pages, 'ID' ) );
+
+                // You can only pass a single ID to exclude_tree
+                $pages = get_pages( 'exclude_tree=' . implode( ',', array( $page_1, $page_2 ) ) );
+                $this->assertEqualSets( array( $page_2, $page_2_child ), wp_list_pluck( $pages, 'ID' ) );
+        }
+
         /**
          * @ticket 9470
          */

tests/phpunit/tests/post/wpListPages.php

@@ +1 @@
+<?php
+
+class Tests_Post_ListPages extends WP_UnitTestCase {
+
+        function setUp() {
+                parent::setUp();
+        }
+
+        function test_wp_list_pages_exclude_all_parents() {
+
+                $page_1       = $this->factory->post->create( array( 'post_type' => 'page' ) );
+                $page_1_child = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+                $page_2       = $this->factory->post->create( array( 'post_type' => 'page' ) );
+                $page_2_child = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_2 ) );
+
+                // excluding the parents should cause wp_list_pages to return nothing
+                $pages = wp_list_pages( 'echo=0&exclude=' . implode( ',', array( $page_1, $page_2 ) ) );
+
+                $this->assertEmpty( $pages );
+
+        }
+
+        function test_wp_list_pages_exclude_tree() {
+
+                $page_1       = $this->factory->post->create( array( 'post_type' => 'page' ) );
+                $page_1_child = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+
+                // excluding the parent should cause wp_list_pages to return nothing
+                $pages = wp_list_pages( 'echo=0&exclude_tree=' . $page_1 );
+
+                $this->assertEmpty( $pages );
+
+        }
+
+}