Changeset 30402

Timestamp:

11/20/2014 01:51:38 AM (9 years ago)

Author:

boonebgorges

Message:

Return an empty array from get_approved_comments() when $post_id is empty.

This behavior was broken when moving the internals to WP_Comment_Query in
[30098]. As a result, get_approved_comments( 0 ) was fetching *all* approved
comments, causing performance issues.

Props dd32.
Fixes #30412.

Location:

trunk

Files:

• src/wp-includes/comment.php (modified) (1 diff)
• tests/phpunit/tests/comment.php (modified) (1 diff)
• tests/phpunit/tests/comment/query.php (modified) (1 diff)

trunk/src/wp-includes/comment.php

@@ -137 +137 @@
  *                             argument is true.
  */
-function get_approved_comments( $post_id = 0, $args = array() ) {
+function get_approved_comments( $post_id, $args = array() ) {
+    if ( ! $post_id ) {
+        return array();
+    }
+
     $defaults = array(
         'status'  => 1,

trunk/tests/phpunit/tests/comment.php

@@ -31 +31 @@
         $this->assertEquals( array( $ca1, $ca2, $c2, $c3, $c4, $c5 ), wp_list_pluck( $found, 'comment_ID' ) );
     }
+
+    /**
+     * @ticket 30412
+     */
+    public function test_get_approved_comments_with_post_id_0_should_return_empty_array() {
+        $p = $this->factory->post->create();
+        $ca1 = $this->factory->comment->create( array( 'comment_post_ID' => $p, 'comment_approved' => '1' ) );
+
+        $found = get_approved_comments( 0 );
+
+        $this->assertSame( array(), $found );
+    }
 }

trunk/tests/phpunit/tests/comment/query.php

@@ -29 +29 @@
 
         $this->assertEqualSets( array( $c1, $c2, $c3, $c4, $c5 ), $found );
+    }
+
+    public function test_query_post_id_0() {
+        $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+
+        $q = new WP_Comment_Query();
+        $found = $q->query( array(
+            'post_id' => 0,
+            'fields' => 'ids',
+        ) );
+
+        $this->assertEqualSets( array( $c1 ), $found );
     }