Changeset 36356 for branches/4.4/tests/phpunit/tests/comment/wpListComments.php

Timestamp:

01/20/2016 05:23:02 AM (11 years ago)

Author:

dd32

Message:

Comments: Always respect $comments array passed to wp_list_comments().

[36157] fixed a bug whereby wp_list_comments() would not properly recognize
custom pagination arguments. See #35175. However, it inadvertently introduced
a bug that caused any $comments array explicitly passed to the function to be
ignored, when that array was accompanied by pagination arguments that differ
from those in $wp_query. We address this bug by moving the logic introduced
in [36157] inside a block that only fires when no $comments array has been
provided to the function.

Merges [36276] to the 4.4 branch.
Props ivankristianto, boonebgorges.
Fixes #35356.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/comment/wpListComments.php (modified) (1 diff)

branches/4.4/tests/phpunit/tests/comment/wpListComments.php

@@ -111 +111 @@
                 $this->assertSame( array( $comments[1], $comments[0] ), array_map( 'intval', $matches[1] ) );
         }
+
+        /**
+         * @ticket 35356
+         * @ticket 35175
+         */
+        public function test_comments_param_should_be_respected_when_custom_pagination_params_are_passed() {
+                $p = self::factory()->post->create();
+
+                $comments = array();
+                $now = time();
+                for ( $i = 0; $i <= 5; $i++ ) {
+                        $comments[] = self::factory()->comment->create( array(
+                                'comment_post_ID' => $p,
+                                'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - $i ),
+                                'comment_author' => 'Commenter ' . $i,
+                        ) );
+                }
+
+                update_option( 'page_comments', true );
+                update_option( 'comments_per_page', 2 );
+
+                $_comments = array( get_comment( $comments[1] ), get_comment( $comments[3] ) );
+
+                // Populate `$wp_query->comments` in order to show that it doesn't override `$_comments`.
+                $this->go_to( get_permalink( $p ) );
+                get_echo( 'comments_template' );
+
+                $found = wp_list_comments( array(
+                        'echo' => false,
+                        'per_page' => 1,
+                        'page' => 2,
+                ), $_comments );
+
+                preg_match_all( '|id="comment\-([0-9]+)"|', $found, $matches );
+                $this->assertSame( array( $comments[3] ), array_map( 'intval', $matches[1] ) );
+        }
 }