Ticket #19623: comment-template-api.diff

wp-includes/comment-template.php

@@ -883 +883 @@
 
        /** @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));
+               $comments = get_comments( array('post_id' => $post->ID, 'unapproved_comment_author_user_id' => $user_ID, 'order' => 'ASC') );
        } 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));
+               $comments = get_comments( array('post_id' => $post->ID, 'unapproved_comment_author_data' => array( 'comment_author' => wp_specialchars_decode($comment_author,ENT_QUOTES), 'comment_author_email' => $comment_author_email ), 'order' => 'ASC') );
        }
 
        // keep $comments for legacy's sake

wp-includes/comment.php

@@ -252 +252 @@
                        $approved = "comment_approved = 'spam'";
                elseif ( 'trash' == $status )
                        $approved = "comment_approved = 'trash'";
+               elseif ( 0 < $unapproved_comment_author_user_id ) //show unapproved comments to the current user if they're the author
+                       $approved = sprintf( "( ( user_id = %d AND comment_approved = '0' ) OR comment_approved = '1' )", $unapproved_comment_author_user_id );
+               elseif ( is_array($unapproved_comment_author_data) && ! empty($unapproved_comment_author_data) && ! empty( $unapproved_comment_author_data['comment_author'] ) && ! empty( $unapproved_comment_author_data['comment_author_email'] ) ) //use the cookie system for current commenter
+                       $approved = sprintf( "( ( comment_author = '%1s' AND comment_author_email = '%2s' AND comment_approved = '0' ) OR comment_approved = '1' )", $unapproved_comment_author_data['comment_author'], $unapproved_comment_author_data['comment_author_email'] );
                else
                        $approved = "( comment_approved = '0' OR comment_approved = '1' )";