Changeset 10422

Timestamp:

01/23/2009 10:26:40 PM (18 years ago)

Author:

ryan

Message:

Eliminate SQL_CACLC_FOUND_ROWS for edit-comments.php query. Use results of earlier wp_count_comments() if appropriate otherwise perform COUNT query. see #7415

File:

• trunk/wp-admin/includes/template.php (modified) (3 diffs)

trunk/wp-admin/includes/template.php

@@ -1921 +1921 @@
         $num = (int) $num;
         $post = (int) $post;
-
-        if ( 'moderated' == $status )
+        $count = wp_count_comments();
+
+        if ( 'moderated' == $status ) {
                 $approved = "comment_approved = '0'";
-        elseif ( 'approved' == $status )
+                $total = $count->moderated;
+        } elseif ( 'approved' == $status ) {
                 $approved = "comment_approved = '1'";
-        elseif ( 'spam' == $status )
+                $total = $count->approved;
+        } elseif ( 'spam' == $status ) {
                 $approved = "comment_approved = 'spam'";
-        else
+                $total = $count->spam;
+        } else {
                 $approved = "( comment_approved = '0' OR comment_approved = '1' )";
+                $total = $count->moderated + $count->approved;
+        }
 
         if ( $post ) {
+                $total = '';
                 $post = " AND comment_post_ID = '$post'";
                 $orderby = "ORDER BY comment_date_gmt ASC LIMIT $start, $num";
@@ -1950 +1957 @@
                 $typesql = '';
 
+        if ( !empty($type) )
+                $total = '';
+
         if ( $s ) {
+                $total = '';
                 $s = $wpdb->escape($s);
-                $comments = $wpdb->get_results("SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE
+                $query = "FROM $wpdb->comments WHERE
                         (comment_author LIKE '%$s%' OR
                         comment_author_email LIKE '%$s%' OR
@@ -1960 +1971 @@
                         $approved
                         $typesql
-                        $orderby");
+                        $orderby";
         } else {
-                $comments = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE $approved $post $typesql $orderby" );
-        }
+                $query = "FROM $wpdb->comments USE INDEX (comment_date_gmt) WHERE $approved $post $typesql $orderby";
+        }
+
+        $comments = $wpdb->get_results("SELECT * $query");
+        if ( '' === $total )
+                $total = $wpdb->get_var("SELECT COUNT(comment_ID) $query");
 
         update_comment_cache($comments);
-
-        $total = $wpdb->get_var( "SELECT FOUND_ROWS()" );
 
         return array($comments, $total);