Changeset 14445

Timestamp:

05/04/2010 06:08:03 PM (15 years ago)

Author:

dd32

Message:

Handle $wp_query->query being a string in r14341. See #12391, #12047. Fixes #13241

File:

• trunk/wp-includes/query.php (modified) (1 diff)

trunk/wp-includes/query.php

@@ -1475 +1475 @@
 
         // Correct is_* for page_on_front and page_for_posts
-        if (    $this->is_home &&
-                'page' == get_option('show_on_front') && get_option('page_on_front') &&
-                ( empty($query) || !array_diff( array_keys($this->query), array('preview', 'page', 'paged', 'cpage') ) )
-                ) {
-            $this->is_page = true;
-            $this->is_home = false;
-            $qv['page_id'] = get_option('page_on_front');
-            // Correct <!--nextpage--> for page_on_front
-            if ( !empty($qv['paged']) ) {
-                $qv['page'] = $qv['paged'];
-                unset($qv['paged']);
+        if ( $this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
+            $_query = wp_parse_args($query);
+            if ( empty($_query) || !array_diff( array_keys($_query), array('preview', 'page', 'paged', 'cpage') ) ) {
+                $this->is_page = true;
+                $this->is_home = false;
+                $qv['page_id'] = get_option('page_on_front');
+                // Correct <!--nextpage--> for page_on_front
+                if ( !empty($qv['paged']) ) {
+                    $qv['page'] = $qv['paged'];
+                    unset($qv['paged']);
+                }
             }
         }