WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@14341 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-05-02 21:28:11 +00:00
parent c3d2524889
commit be926482ce
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/query.php
View File

@ -1475,15 +1475,9 @@ class WP_Query {
// 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;
$qv['page_id'] = get_option('page_on_front');