Ticket #25143: 25143.2.patch

src/wp-includes/query.php

@@ -853 +853 @@
          * @var array
          */
         public $query_vars = array();
+        
+        /**
+         * Default query vars
+         *
+         * @access private
+         * @var array
+         */
+        private $default_query_vars = array();
 
         /**
          * Taxonomy query, as passed to get_tax_sql()
@@ -1558 +1566 @@
                 }
 
                 $this->query_vars = $this->fill_query_vars($this->query_vars);
+                $this->default_query_vars = $this->fill_query_vars( array() );
+
                 $qv = &$this->query_vars;
                 $this->query_vars_changed = true;
 
@@ -1766 +1776 @@
                                         $qv['page'] = $qv['paged'];
                                         unset($qv['paged']);
                                 }
+                        } elseif( ! empty( $_query ) ) {
+
+                                $front = false;
+                                foreach( $_query as $key ) {
+                                        if( in_array( $key, $this->default_query_vars ) ) {
+                                                continue;
+                                        }
+                                        $front = true;
+                                }
+
+                                if( $front ) {
+                                        $this->is_page = true;
+                                        $this->is_home = false;
+                                        $qv['page_id'] = get_option('page_on_front');
+                                }
                         }
+                        
                 }
 
                 if ( '' != $qv['pagename'] ) {