Ticket #15459: 15459.5.diff

src/wp-admin/includes/class-wp-posts-list-table.php

@@ -450 +450 @@
                 $count = 0;
                 $start = ( $pagenum - 1 ) * $per_page;
                 $end = $start + $per_page;
+                $to_display = array();
 
                 foreach ( $pages as $page ) {
                         if ( $count >= $end )
                                 break;
 
                         if ( $count >= $start ) {
-                                echo "\t";
-                                $this->single_row( $page, $level );
+                                $to_display[$page->ID] = $level;
                         }
 
                         $count++;
 
                         if ( isset( $children_pages ) )
-                                $this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
+                                $this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
                 }
 
                 // If it is the last pagenum and there are orphaned pages, display them with paging as well.
@@ -474 +474 @@
                                                 break;
 
                                         if ( $count >= $start ) {
-                                                echo "\t";
-                                                $this->single_row( $op, 0 );
+                                                $to_display[$op->ID] = 0;
                                         }
 
                                         $count++;
                                 }
                         }
                 }
+
+                $ids = array_keys( $to_display );
+                _prime_post_caches( $ids );
+
+                if ( ! isset( $GLOBALS['post'] ) ) {
+                        // touch_time() requires a global post set
+                        $GLOBALS['post'] = array_shift( $ids );
+                }
+
+                foreach ( $to_display as $page_id => $level ) {
+                        echo "\t";
+                        $this->single_row( $page_id, $level );
+                }
         }
 
         /**
@@ -496 +508 @@
          * @param int $level
          * @param int $pagenum
          * @param int $per_page
+         * @param array $to_display list of pages to be displayed
          */
-        private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page ) {
+        private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
 
                 if ( ! isset( $children_pages[$parent] ) )
                         return;
@@ -515 +528 @@
                                 $my_parents = array();
                                 $my_parent = $page->post_parent;
                                 while ( $my_parent ) {
-                                        $my_parent = get_post( $my_parent );
+                                        // Get the ID from the list or the attribute if my_parent is an object
+                                        $parent_id = $my_parent;
+                                        if ( is_object( $my_parent ) ) {
+                                                $parent_id = $my_parent->ID;
+                                        }
+
+                                        $my_parent = get_post( $parent_id );
                                         $my_parents[] = $my_parent;
                                         if ( !$my_parent->post_parent )
                                                 break;
@@ -523 +542 @@
                                 }
                                 $num_parents = count( $my_parents );
                                 while ( $my_parent = array_pop( $my_parents ) ) {
-                                        echo "\t";
-                                        $this->single_row( $my_parent, $level - $num_parents );
+                                        $to_display[$my_parent->ID] = $level - $num_parents;
                                         $num_parents--;
                                 }
                         }
 
                         if ( $count >= $start ) {
-                                echo "\t";
-                                $this->single_row( $page, $level );
+                                $to_display[$page->ID] = $level;
                         }
 
                         $count++;
 
-                        $this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
+                        $this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
                 }
 
                 unset( $children_pages[$parent] ); //required in order to keep track of orphans
@@ -547 +564 @@
                 static $alternate;
 
                 $global_post = get_post();
+
+                if ( is_integer( $post ) ) {
+                        $post = get_post( $post );
+                }
+
                 $GLOBALS['post'] = $post;
                 setup_postdata( $post );
 

src/wp-admin/includes/post.php

@@ -985 +985 @@
                 $query['order'] = 'asc';
                 $query['posts_per_page'] = -1;
                 $query['posts_per_archive_page'] = -1;
+                $query['fields'] = 'id=>parent';
         }
 
         if ( ! empty( $q['show_sticky'] ) )

src/wp-includes/class-wp.php

@@ -25 +25 @@
          * @since 2.0.0
          * @var array
          */
-        public $private_query_vars = array( 'offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in' );
+        public $private_query_vars = array( 'offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in', 'fields' );
 
         /**
          * Extra query variables set by the user.

tests/phpunit/tests/admin/includesListTable.php

@@ +1 @@
+<?php
+
+/**
+ * @group admin
+ */
+class Tests_Admin_includesListTable extends WP_UnitTestCase {
+        function setUp() {
+                set_current_screen( 'edit-page' );
+                $GLOBALS['hook_suffix'] = '';
+                $this->table = _get_list_table( 'WP_Posts_List_Table' );
+
+                parent::setUp();
+
+                // create top level pages
+                $num_posts = 5;
+                foreach ( range( 1, $num_posts ) as $i ) {
+                        $this->pages[] = $this->factory->post->create_and_get( array(
+                                'post_type' => 'page',
+                        ) );
+                }
+
+                // create child pages
+                $num_posts = 3;
+                foreach ( $this->pages as $page ) {
+                        foreach ( range( 1, $num_posts ) as $i ) {
+                                $this->pages[] = $this->factory->post->create_and_get(
+                                        array(
+                                                'post_type' => 'page',
+                                                'post_parent' => $page->ID,
+                                        )
+                                );
+                        }
+                }
+        }
+
+        /**
+         * @ticket 15459
+         */
+        function test_list_hierarchical_pages_first_page() {
+                $this->_test_list_hierarchical_page( 1, array( 'post-3', 'post-8' ), 2 );
+        }
+
+        /**
+         * @ticket 15459
+         */
+        function test_list_hierarchical_pages_second_page() {
+                $this->_test_list_hierarchical_page( 2, array( 'post-23', 'post-29', 'post-30' ), 3 );
+        }
+
+        /**
+         * Helper function to test the output of a
+         * WP_Posts_List_Table page
+         *
+         * @param $page_num
+         * @param $expected_ids
+         * @param $expected_count
+         */
+        protected function _test_list_hierarchical_page( $page_num, $expected_ids, $expected_count ) {
+                global $per_page;
+
+                $matches = array();
+                $per_page = 2;
+                $_REQUEST['paged'] = $page_num;
+                $this->table->hierarchical_display = true;
+
+                ob_start();
+                $this->table->display_rows( $this->pages );
+                $output = ob_get_clean();
+                preg_match_all( '|<tr[^>]*>|', $output, $matches );
+
+                $this->assertCount( $expected_count, array_keys( $matches[0] ) );
+
+                foreach ( $expected_ids as $id ) {
+                        $this->assertContains( $id, $output );
+                }
+        }
+}