Changeset 46494 for branches/4.8/src/wp-includes/class-wp-query.php

Timestamp:

10/14/2019 06:44:54 PM (7 years ago)

Author:

whyisjake

Message:

Backporting several bug fixes.

• Query: Remove the static query property.
• HTTP API: Protect against hex interpretation.
• Filesystem API: Prevent directory travelersals when creating new folders.
• Administration: Ensure that admin referer nonce is valid.
• REST API: Send a Vary: Origin header on GET requests.

Backports [46474], [46475], [46476], [46477], [46478], [46483], [46485] to the 4.8 branch.

Location:

branches/4.8

Files:

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

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

@@ -583 +583 @@
             , 'attachment_id'
             , 'name'
-            , 'static'
             , 'pagename'
             , 'page_id'
@@ -814 +813 @@
             // post is being queried.
             $this->is_single = true;
-        } elseif ( '' != $qv['static'] || '' != $qv['pagename'] || !empty($qv['page_id']) ) {
+        } elseif ( '' != $qv['pagename'] || !empty($qv['page_id']) ) {
             $this->is_page = true;
             $this->is_single = false;
@@ -3059 +3058 @@
             $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;
+                }
+            }
         }