When using Page on front, Do not jump back to Blog listing when per-page query vars are set. Fixes #12047
git-svn-id: https://develop.svn.wordpress.org/trunk@13493 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
4070e39a15
commit
e7721041df
@ -1474,7 +1474,14 @@ class WP_Query {
|
|||||||
$this->is_home = true;
|
$this->is_home = true;
|
||||||
|
|
||||||
// Correct is_* for page_on_front and page_for_posts
|
// 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_page = true;
|
||||||
$this->is_home = false;
|
$this->is_home = false;
|
||||||
$qv['page_id'] = get_option('page_on_front');
|
$qv['page_id'] = get_option('page_on_front');
|
||||||
|
Loading…
Reference in New Issue
Block a user