WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Avoid FOUND ROWS when no posts are found 

* Set post_count and found_posts for all 'fields' queries.
* Set found_posts to post_count when limits are not used
* Update phpdoc for $found_posts and set_found_posts()

Props SergeyBiryukov, wonderboymusic

fixes #14426



git-svn-id: http://core.svn.wordpress.org/trunk@21928 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-09-20 14:55:54 +00:00
parent 75a9ce4b37
commit 2b044bc85f
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
wp-includes/query.php
View File

@ -979,7 +979,9 @@ class WP_Query {
var $comment; var $comment;
/** /**
* Amount of posts if limit clause was not used. * The amount of found posts for the current query.
*
* If limit clause was not used, equals $post_count.
* *
* @since 2.1.0 * @since 2.1.0
* @access public * @access public
@ -2630,13 +2632,17 @@ class WP_Query {
} }
if ( 'ids' == $q['fields'] ) { if ( 'ids' == $q['fields'] ) {
$this->posts = $wpdb->get_col($this->request); $this->posts = $wpdb->get_col( $this->request );
$this->post_count = count( $this->posts );
$this->set_found_posts( $q, $limits );
return $this->posts; return $this->posts;
} }
if ( 'id=>parent' == $q['fields'] ) { if ( 'id=>parent' == $q['fields'] ) {
$this->posts = $wpdb->get_results($this->request); $this->posts = $wpdb->get_results( $this->request );
$this->post_count = count( $this->posts );
$this->set_found_posts( $q, $limits );
$r = array(); $r = array();
foreach ( $this->posts as $post ) foreach ( $this->posts as $post )
@ -2658,12 +2664,11 @@ class WP_Query {
$ids = $wpdb->get_col( $this->request ); $ids = $wpdb->get_col( $this->request );
if ( $ids ) { if ( $ids ) {
$this->posts = $ids;
$this->set_found_posts( $q, $limits ); $this->set_found_posts( $q, $limits );
_prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] ); _prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
$this->posts = $ids;
} else { } else {
$this->posts = array(); $this->posts = array();
$this->found_posts = $this->max_num_pages = 0;
} }
} else { } else {
$this->posts = $wpdb->get_results( $this->request ); $this->posts = $wpdb->get_results( $this->request );
@ -2766,7 +2771,7 @@ class WP_Query {
if ( !$q['suppress_filters'] ) if ( !$q['suppress_filters'] )
$this->posts = apply_filters_ref_array('the_posts', array( $this->posts, &$this ) ); $this->posts = apply_filters_ref_array('the_posts', array( $this->posts, &$this ) );
$this->post_count = count($this->posts); $this->post_count = count( $this->posts );
// Always sanitize // Always sanitize
foreach ( $this->posts as $i => $post ) { foreach ( $this->posts as $i => $post ) {
@ -2783,16 +2788,28 @@ class WP_Query {
return $this->posts; return $this->posts;
} }
/**
* Set up the amount of found posts and the number of pages (if limit clause was used)
* for the current query.
*
* @since 3.5.0
* @access private
*/
function set_found_posts( $q, $limits ) { function set_found_posts( $q, $limits ) {
global $wpdb; global $wpdb;
if ( $q['no_found_rows'] || empty( $limits ) ) if ( $q['no_found_rows'] || ! $this->posts )
return; return;
$this->found_posts = $wpdb->get_var( apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) ) ); if ( ! empty( $limits ) )
$this->found_posts = $wpdb->get_var( apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) ) );
else
$this->found_posts = count( $this->posts );
$this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) ); $this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) );
$this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] ); if ( ! empty( $limits ) )
$this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
} }
/** /**