Changeset 21928

Timestamp:

09/20/2012 02:55:54 PM (14 years ago)

Author:

ryan

Message:

• 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

File:

• trunk/wp-includes/query.php (modified) (6 diffs)

trunk/wp-includes/query.php

@@ -980 +980 @@
 
         /**
-         * 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
@@ -2631 +2633 @@
 
                 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;
@@ -2637 +2641 @@
 
                 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();
@@ -2659 +2665 @@
 
                         if ( $ids ) {
+                                $this->posts = $ids;
                                 $this->set_found_posts( $q, $limits );
                                 _prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
-                                $this->posts = $ids;
                         } else {
                                 $this->posts = array();
-                                $this->found_posts = $this->max_num_pages = 0;
                         }
                 } else {
@@ -2767 +2772 @@
                         $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
@@ -2784 +2789 @@
         }
 
+        /**
+         * 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 ) {
                 global $wpdb;
 
-                if ( $q['no_found_rows'] || empty( $limits ) )
+                if ( $q['no_found_rows'] || ! $this->posts )
                         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->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'] );
         }