Changeset 16020

Timestamp:

10/27/2010 07:05:39 PM (14 years ago)

Author:

scribu

Message:

Make comment clauses more similar to post clauses. See #15019

File:

• trunk/wp-includes/comment.php (modified) (2 diffs)

trunk/wp-includes/comment.php

@@ -293 +293 @@
         if ( !empty($number) ) {
             if ( $offset )
-                $limit = 'LIMIT ' . $offset . ',' . $number;
+                $limits = 'LIMIT ' . $offset . ',' . $number;
             else
-                $limit = 'LIMIT ' . $number;
+                $limits = 'LIMIT ' . $number;
         } else {
-            $limit = '';
+            $limits = '';
         }
 
-        $where = "WHERE $approved";
+        if ( $count )
+            $fields = 'COUNT(*)';
+        else
+            $fields = '*';
+
+        $join = '';
+        $where = $approved;
 
         if ( ! empty($post_id) )
@@ -319 +325 @@
             $where .= $this->get_search_sql( $search, array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content' ) );
 
-        $pieces = array( 'where', 'orderby', 'order', 'limit' );
+        $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' );
         $clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
         foreach ( $pieces as $piece )
             $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
 
+        $query = "SELECT $fields FROM $wpdb->comments $join WHERE $where ORDER BY $orderby $order $limits";
+
         if ( $count )
-            return $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments $where ORDER BY $orderby $order $limit" );
-
-        $comments = $wpdb->get_results( "SELECT * FROM $wpdb->comments $where ORDER BY $orderby $order $limit" );
+            return $wpdb->get_var( $query );
+
+        $comments = $wpdb->get_results( $query );
         $comments = apply_filters_ref_array( 'the_comments', array( $comments, &$this ) );