sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

git-svn-id: https://develop.svn.wordpress.org/trunk@16020 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
scribu 2010-10-27 19:05:39 +00:00
parent 1f23d12a79
commit 665b15790d
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wp-includes/comment.php
View File

@ -292,14 +292,20 @@ class WP_Comment_Query extends WP_Object_Query {
if ( !empty($number) ) { if ( !empty($number) ) {
if ( $offset ) if ( $offset )
$limit = 'LIMIT ' . $offset . ',' . $number; $limits = 'LIMIT ' . $offset . ',' . $number;
else else
$limit = 'LIMIT ' . $number; $limits = 'LIMIT ' . $number;
} else { } else {
$limit = ''; $limits = '';
} }
$where = "WHERE $approved"; if ( $count )
$fields = 'COUNT(*)';
else
$fields = '*';
$join = '';
$where = $approved;
if ( ! empty($post_id) ) if ( ! empty($post_id) )
$where .= $wpdb->prepare( ' AND comment_post_ID = %d', $post_id ); $where .= $wpdb->prepare( ' AND comment_post_ID = %d', $post_id );
@ -318,15 +324,17 @@ class WP_Comment_Query extends WP_Object_Query {
if ( '' !== $search ) if ( '' !== $search )
$where .= $this->get_search_sql( $search, array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content' ) ); $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 ) ); $clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
foreach ( $pieces as $piece ) foreach ( $pieces as $piece )
$$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : ''; $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
if ( $count ) $query = "SELECT $fields FROM $wpdb->comments $join WHERE $where ORDER BY $orderby $order $limits";
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" ); if ( $count )
return $wpdb->get_var( $query );
$comments = $wpdb->get_results( $query );
$comments = apply_filters_ref_array( 'the_comments', array( $comments, &$this ) ); $comments = apply_filters_ref_array( 'the_comments', array( $comments, &$this ) );
wp_cache_add( $cache_key, $comments, 'comment' ); wp_cache_add( $cache_key, $comments, 'comment' );