Ticket #19623: 19623.patch

src/wp-includes/comment-template.php

@@ -1112 +1112 @@
          */
         $comment_author_url = esc_url($commenter['comment_author_url']);
 
-        /** @todo Use API instead of SELECTs. */
-        if ( $user_ID) {
-                $comments = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND (comment_approved = '1' OR ( user_id = %d AND comment_approved = '0' ) )  ORDER BY comment_date_gmt", $post->ID, $user_ID));
-        } else if ( empty($comment_author) ) {
-                $comments = get_comments( array('post_id' => $post->ID, 'status' => 'approve', 'order' => 'ASC') );
-        } else {
-                $comments = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND ( comment_approved = '1' OR ( comment_author = %s AND comment_author_email = %s AND comment_approved = '0' ) ) ORDER BY comment_date_gmt", $post->ID, wp_specialchars_decode($comment_author,ENT_QUOTES), $comment_author_email));
+        $comment_args = array(
+                'order'   => 'ASC',
+                'orderby' => 'comment_date_gmt',
+                'status'  => 'approve',
+                'post_id' => $post->ID,
+        );
+
+        if ( $user_ID ) {
+                $comment_args['include_unapproved'] = array( $user_ID );
+        } else if ( ! empty( $comment_author ) ) {
+                $comment_args['include_unapproved'] = array( $comment_author_email );
         }
 
+        $comments = get_comments( $comment_args );
+
         /**
          * Filter the comments array.
          *

src/wp-includes/comment.php

@@ -271 +271 @@
                         'author_email' => '',
                         'author__in' => '',
                         'author__not_in' => '',
+                        'include_unapproved' => '',
                         'fields' => '',
                         'ID' => '',
                         'comment__in' => '',
@@ -333 +334 @@
                         return $cache;
                 }
 
+                // Assemble clauses related to 'comment_approved'
+                $approved_clauses = array();
                 $status = $this->query_vars['status'];
                 if ( 'hold' == $status ) {
-                        $approved = "comment_approved = '0'";
+                        $approved_clauses[] = "comment_approved = '0'";
                 } elseif ( 'approve' == $status ) {
-                        $approved = "comment_approved = '1'";
+                        $approved_clauses[] = "comment_approved = '1'";
                 } elseif ( ! empty( $status ) && 'all' != $status ) {
-                        $approved = $wpdb->prepare( "comment_approved = %s", $status );
+                        $approved_clauses[] = $wpdb->prepare( "comment_approved = %s", $status );
                 } else {
-                        $approved = "( comment_approved = '0' OR comment_approved = '1' )";
+                        $approved_clauses[] = "( comment_approved = '0' OR comment_approved = '1' )";
                 }
+
+                // User IDs or email addresses whose unapproved comments are included, regardless of $status.
+                if ( ! empty( $this->query_vars['include_unapproved'] ) ) {
+                        $include_unapproved = $this->query_vars['include_unapproved'];
+
+                        // Accepts arrays or comma-separated strings.
+                        if ( ! is_array( $include_unapproved ) ) {
+                                $include_unapproved = preg_split( '/[\s,]+/', $include_unapproved );
+                        }
+
+                        $unapproved_ids = $unapproved_emails = array();
+                        foreach ( $include_unapproved as $unapproved_identifier ) {
+                                // Numeric values are assumed to be user ids.
+                                if ( is_numeric( $unapproved_identifier ) ) {
+                                        $approved_clauses[] = $wpdb->prepare( "( user_id = %d AND comment_approved = '0' )", $unapproved_identifier );
+
+                                // Otherwise we match against email addresses.
+                                } else {
+                                        $approved_clauses[] = $wpdb->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
+                                }
+                        }
+                }
+
+                // Collapse comment_approved clauses into a single OR-separated clause
+                if ( 1 === count( $approved_clauses ) ) {
+                        $approved = $approved_clauses[0];
+                } else {
+                        $approved = '( ' . implode( ' OR ', $approved_clauses ) . ' )';
+                }
+
                 $order = ( 'ASC' == strtoupper( $this->query_vars['order'] ) ) ? 'ASC' : 'DESC';
 
                 if ( ! empty( $this->query_vars['orderby'] ) ) {

tests/phpunit/tests/comment/query.php

@@ -360 +360 @@
 
                 $this->assertEqualSets( array( $c3, $c4 ), $comment_ids );
         }
+
+        /**
+         * @ticket 19623
+         */
+        public function test_get_comments_with_status_all() {
+                $comment_1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $comment_2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $comment_3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
+                $comments_approved_1 = get_comments( array( 'status' => 'all' ) );
+
+                $comment_ids = get_comments( array( 'fields' => 'ids' ) );
+                $this->assertEqualSets( array( $comment_1, $comment_2, $comment_3 ), $comment_ids );
+        }
+
+        /**
+         * @ticket 19623
+         */
+        public function test_get_comments_with_include_unapproved_user_id() {
+                $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
+                $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
+
+                $found = get_comments( array(
+                        'fields' => 'ids',
+                        'include_unapproved' => 1,
+                        'status' => 'approve',
+                ) );
+
+                $this->assertEqualSets( array( $c1, $c2, $c3 ), $found );
+        }
+
+        /**
+         * @ticket 19623
+         */
+        public function test_get_comments_with_include_unapproved_user_id_array() {
+                $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
+                $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
+                $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 8, 'comment_approved' => '0' ) );
+
+                $found = get_comments( array(
+                        'fields' => 'ids',
+                        'include_unapproved' => array( 1, 8 ),
+                        'status' => 'approve',
+                ) );
+
+                $this->assertEqualSets( array( $c1, $c2, $c3, $c5 ), $found );
+        }
+
+        /**
+         * @ticket 19623
+         */
+        public function test_get_comments_with_include_unapproved_user_id_comma_separated() {
+                $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
+                $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
+                $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 8, 'comment_approved' => '0' ) );
+
+                $found = get_comments( array(
+                        'fields' => 'ids',
+                        'include_unapproved' => '1,8',
+                        'status' => 'approve',
+                ) );
+
+                $this->assertEqualSets( array( $c1, $c2, $c3, $c5 ), $found );
+        }
+
+        /**
+         * @ticket 19623
+         */
+        public function test_get_comments_with_include_unapproved_author_email() {
+                $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+                $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+                $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
+
+                $found = get_comments( array(
+                        'fields' => 'ids',
+                        'include_unapproved' => 'foo@example.com',
+                        'status' => 'approve',
+                ) );
+
+                $this->assertEqualSets( array( $c1, $c2, $c3 ), $found );
+        }
+
+        /**
+         * @ticket 19623
+         */
+        public function test_get_comments_with_include_unapproved_mixed_array() {
+                $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+                $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+                $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
+                $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
+
+                $found = get_comments( array(
+                        'fields' => 'ids',
+                        'include_unapproved' => array( 'foo@example.com', 4 ),
+                        'status' => 'approve',
+                ) );
+
+                $this->assertEqualSets( array( $c1, $c2, $c3, $c5 ), $found );
+        }
+
+        /**
+         * @ticket 19623
+         */
+        public function test_get_comments_with_include_unapproved_mixed_comma_separated() {
+                $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+                $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+                $c4 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
+                $c5 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
+
+                $found = get_comments( array(
+                        'fields' => 'ids',
+                        'include_unapproved' => 'foo@example.com, 4',
+                        'status' => 'approve',
+                ) );
+
+                $this->assertEqualSets( array( $c1, $c2, $c3, $c5 ), $found );
+        }
 }