mirror of
https://github.com/WordPress/WordPress.git
synced 2025-01-22 08:11:52 +01:00
Use ->query instead of . Always kick off the parse_query action. fixes #16545 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@17455 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
ffc27243db
commit
a2603e710e
@ -1570,7 +1570,7 @@ 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') ) {
|
||||
$_query = wp_parse_args($query);
|
||||
$_query = wp_parse_args($this->query);
|
||||
// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
|
||||
if ( isset($_query['pagename']) && '' == $_query['pagename'] )
|
||||
unset($_query['pagename']);
|
||||
@ -1627,8 +1627,7 @@ class WP_Query {
|
||||
if ( '404' == $qv['error'] )
|
||||
$this->set_404();
|
||||
|
||||
if ( !empty($query) )
|
||||
do_action_ref_array('parse_query', array(&$this));
|
||||
do_action_ref_array('parse_query', array(&$this));
|
||||
}
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user