Changeset 25976

Timestamp:

10/29/2013 01:49:05 AM (11 years ago)

Author:

nacin

Message:

Avoid resetting the 'hierarchical' argument in get_pages() when 'parent' is -1, the default.

Merges [25974] and [25975] to the 3.7 branch.

Fixes a regression introduced in [25270]. Adds unit tests.

props chrisbliss18.
fixes #25750.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wp-includes/post.php (modified) (1 diff)
• tests/phpunit/tests/post/getPages.php (modified) (1 diff)

branches/3.7/src/wp-includes/post.php

@@ -3707 +3707 @@
         return $pages;
 
-    if ( $parent && ! $child_of )
+    if ( $parent > 0 && ! $child_of )
         $hierarchical = false;
 

branches/3.7/tests/phpunit/tests/post/getPages.php

@@ -129 +129 @@
         $this->assertEqualSets( $child_ids, $post_ids );
     }
+
+    /**
+     * @ticket 25750
+     */
+    function test_get_pages_hierarchical_and_no_parent() {
+        global $wpdb;
+        $page_1 = $this->factory->post->create( array( 'post_type' => 'page' ) );
+        $page_2 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+        $page_3 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+        $page_4 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_2 ) );
+
+        $pages = get_pages(); // Defaults: hierarchical = true, parent = -1
+        $pages_default_args = get_pages( array( 'hierarchical' => true, 'parent' => -1 ) );
+        // Confirm the defaults.
+        $this->assertEquals( $pages, $pages_default_args );
+
+        /*
+         * Here's the tree we are testing:
+         *
+         * page 1
+         * - page 2
+         * -- page 4
+         * - page 3
+         *
+         * If hierarchical => true works, the order will be 1,2,4,3.
+         * If it doesn't, they will be in the creation order, 1,2,3,4.
+         */
+
+        $this->assertEqualSets( array( $page_1, $page_2, $page_4, $page_3 ), wp_list_pluck( $pages, 'ID' ) );
+    }
 }