sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clear all other query flags if we have a 404. fixes #1413 

git-svn-id: https://develop.svn.wordpress.org/trunk@2885 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2005-09-16 03:16:12 +00:00
parent 65ec262bb0
commit 41b9b94616
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wp-includes/classes.php
View File

@ -30,7 +30,7 @@ class WP_Query {
var $is_comments_popup = false; var $is_comments_popup = false;
var $is_admin = false; var $is_admin = false;
function init () { function init_query_flags() {
$this->is_single = false; $this->is_single = false;
$this->is_page = false; $this->is_page = false;
$this->is_archive = false; $this->is_archive = false;
@ -48,7 +48,9 @@ class WP_Query {
$this->is_404 = false; $this->is_404 = false;
$this->is_paged = false; $this->is_paged = false;
$this->is_admin = false; $this->is_admin = false;
}
function init () {
unset($this->posts); unset($this->posts);
unset($this->query); unset($this->query);
unset($this->query_vars); unset($this->query_vars);
@ -57,6 +59,8 @@ class WP_Query {
$this->post_count = 0; $this->post_count = 0;
$this->current_post = -1; $this->current_post = -1;
$this->in_the_loop = false; $this->in_the_loop = false;
$this->init_query_flags();
} }
// Reparse the query vars. // Reparse the query vars.
@ -73,6 +77,14 @@ class WP_Query {
$this->query_vars = $qv; $this->query_vars = $qv;
} }
if ('404' == $qv['error']) {
$this->is_404 = true;
if ( !empty($query) ) {
do_action('parse_query', array(&$this));
}
return;
}
$qv['m'] = (int) $qv['m']; $qv['m'] = (int) $qv['m'];
$qv['p'] = (int) $qv['p']; $qv['p'] = (int) $qv['p'];
@ -182,10 +194,6 @@ class WP_Query {
$this->is_trackback = true; $this->is_trackback = true;
} }
if ('404' == $qv['error']) {
$this->is_404 = true;
}
if ('' != $qv['paged']) { if ('' != $qv['paged']) {
$this->is_paged = true; $this->is_paged = true;
} }
@ -207,6 +215,11 @@ class WP_Query {
} }
} }
function set_404() {
$this->init_query_flags();
$this->is_404 = true;
}
function get($query_var) { function get($query_var) {
if (isset($this->query_vars[$query_var])) { if (isset($this->query_vars[$query_var])) {
return $this->query_vars[$query_var]; return $this->query_vars[$query_var];
@ -1518,7 +1531,7 @@ class WP {
if ( (0 == count($wp_query->posts)) && !is_404() && !is_search() if ( (0 == count($wp_query->posts)) && !is_404() && !is_search()
&& ( $this->did_permalink || (!empty($_SERVER['QUERY_STRING']) && && ( $this->did_permalink || (!empty($_SERVER['QUERY_STRING']) &&
(false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) { (false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) {
$wp_query->is_404 = true; $wp_query->set_404();
status_header( 404 ); status_header( 404 );
} else { } else {
status_header( 200 ); status_header( 200 );