Changeset 42597 for branches/4.9/src/wp-includes/class-wp-query.php

Timestamp:

01/24/2018 09:43:17 PM (8 years ago)

Author:

jorbin

Message:

Query: Fix warning on counting non countable

Merges [42581], [42585], and [42594] to the 4.9 branch.

Adds tests to continue the behavior for both null and strings. Skip the tests on PHP 5.2 as they require ReflectionMethod.

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

Fixes #42860.
Props dd32 for test skipping and janak007 and ayeshrajans for initial patches.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-query.php (modified) (1 diff)

branches/4.9/src/wp-includes/class-wp-query.php

@@ -3033 +3033 @@
             $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 );
+            if ( is_array( $this->posts ) ) {
+                $this->found_posts = count( $this->posts );
+            } else {
+                if ( null === $this->posts ) {  
+                    $this->found_posts = 0;
+                } else {
+                    $this->found_posts = 1;
+                }
+            }
         }