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

Handle $wp_query->query being a string in r14341. See #12391, #12047. Fixes #13241 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14445 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-05-04 18:08:03 +00:00
parent cea6004286
commit ce9fce6073
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/query.php
View File

@ -1474,10 +1474,9 @@ 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 && if ( $this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
'page' == get_option('show_on_front') && get_option('page_on_front') && $_query = wp_parse_args($query);
( empty($query) || !array_diff( array_keys($this->query), array('preview', 'page', 'paged', 'cpage') ) ) if ( empty($_query) || !array_diff( array_keys($_query), array('preview', 'page', 'paged', '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');
@ -1487,6 +1486,7 @@ class WP_Query {
unset($qv['paged']); unset($qv['paged']);
} }
} }
}
if ( '' != $qv['pagename'] ) { if ( '' != $qv['pagename'] ) {
$this->queried_object =& get_page_by_path($qv['pagename']); $this->queried_object =& get_page_by_path($qv['pagename']);