From 2724b924d6956dd0310b71f41a0d6dcc0154d94a Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 26 Jan 2009 22:34:50 +0000 Subject: [PATCH] Force the index only for 0 OR 1 queries. see #7415 git-svn-id: http://svn.automattic.com/wordpress/trunk@10446 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/template.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 8b4a4231ee..590f0c75bc 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -1921,7 +1921,8 @@ function _wp_get_comment_list( $status = '', $s = false, $start, $num, $post = 0 $num = (int) $num; $post = (int) $post; $count = wp_count_comments(); - + $index = ''; + if ( 'moderated' == $status ) { $approved = "comment_approved = '0'"; $total = $count->moderated; @@ -1934,6 +1935,7 @@ function _wp_get_comment_list( $status = '', $s = false, $start, $num, $post = 0 } else { $approved = "( comment_approved = '0' OR comment_approved = '1' )"; $total = $count->moderated + $count->approved; + $index = 'USE INDEX (comment_date_gmt)'; } if ( $post ) { @@ -1971,7 +1973,7 @@ function _wp_get_comment_list( $status = '', $s = false, $start, $num, $post = 0 $approved $typesql"; } else { - $query = "FROM $wpdb->comments USE INDEX (comment_date_gmt) WHERE $approved $post $typesql"; + $query = "FROM $wpdb->comments $index WHERE $approved $post $typesql"; } $comments = $wpdb->get_results("SELECT * $query $orderby");