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

When using Page on front, Do not jump back to Blog listing when per-page query vars are set. Fixes #12047 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13493 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-02-28 09:19:34 +00:00
parent db84578f24
commit 479926f048
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/query.php
View File

@ -1474,7 +1474,14 @@ class WP_Query {
$this->is_home = true;
// Correct is_* for page_on_front and page_for_posts
if ( $this->is_home && ( empty($this->query) || $qv['preview'] == 'true' ) && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
if ( $this->is_home &&
'page' == get_option('show_on_front') &&
get_option('page_on_front') &&
(
empty($this->query) ||
!empty($qv['preview']) ||
!empty($qv['cpage'])
) ) {
$this->is_page = true;
$this->is_home = false;
$qv['page_id'] = get_option('page_on_front');