WordPress.org

Make WordPress Core


Ignore:
Timestamp:
01/24/2018 01:20:24 AM (4 years ago)
Author:
jorbin
Message:

Query: Fix warning on counting non countable

Adds tests to continue the behavior for both null and strings.

See https://wiki.php.net/rfc/counting_non_countables for information on the PHP change.

Fixes #42860.
Props janak007 and ayeshrajans for initial patches.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/class-wp-query.php

    r42343 r42581  
    31593159            $this->found_posts = $wpdb->get_var( apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) ) );
    31603160        } else {
    3161             $this->found_posts = count( $this->posts );
     3161            if ( is_array( $this->posts ) ) {
     3162                $this->found_posts = count( $this->posts );
     3163            } else {
     3164                if ( null === $this->posts ) { 
     3165                    $this->found_posts = 0;
     3166                } else {
     3167                    $this->found_posts = 1;
     3168                }
     3169            }
    31623170        }
    31633171
Note: See TracChangeset for help on using the changeset viewer.