Changeset 14341 for trunk/wp-includes/query.php

Timestamp:

05/02/2010 09:28:11 PM (16 years ago)

Author:

dd32

Message:

Fix custom WP_Queries when using page_on_front. Props aaroncampbell. See #12391 (Which caused it), Fixes #12047

File:

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

trunk/wp-includes/query.php

@@ -1476 +1476 @@
                 // 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($this->query) ||
-                                        !empty($qv['preview']) ||
-                                        !empty($qv['cpage']) ||
-                                        !empty($qv['page']) ||
-                                        !empty($qv['paged'])
-                                ) ) {
+                                '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;