From 3f642ba717bb05e7fb5a0ff56d5baaefc1bbcdee Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Fri, 8 May 2015 19:45:26 +0000 Subject: [PATCH] Use table prefix for `comment__in` and `comment__not_in` SQL clauses of `WP_Comment_Query`. The prefix prevents ambiguity when joining against other tables. Props willgladstone. Fixes #32081. Built from https://develop.svn.wordpress.org/trunk@32461 git-svn-id: http://core.svn.wordpress.org/trunk@32431 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/comment.php | 4 ++-- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/comment.php b/wp-includes/comment.php index e2ed55386a..c5be35b13b 100644 --- a/wp-includes/comment.php +++ b/wp-includes/comment.php @@ -696,12 +696,12 @@ class WP_Comment_Query { // Parse comment IDs for an IN clause. if ( ! empty( $this->query_vars['comment__in'] ) ) { - $where[] = 'comment_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )'; + $where[] = "$wpdb->comments.comment_ID IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )'; } // Parse comment IDs for a NOT IN clause. if ( ! empty( $this->query_vars['comment__not_in'] ) ) { - $where[] = 'comment_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )'; + $where[] = "$wpdb->comments.comment_ID NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )'; } // Parse comment post IDs for an IN clause. diff --git a/wp-includes/version.php b/wp-includes/version.php index bc1bed4aa7..5c5d51c380 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32460'; +$wp_version = '4.3-alpha-32461'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.