Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-27 15:24:59 +02:00
Code Issues Projects Releases Wiki Activity

Fix 404s. Props donncha. fixes #1471

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@3108 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2005-11-16 10:16:20 +00:00
parent 60006e43f2
commit aba1a4437d
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-includes/classes.php
View File

@ -1488,6 +1488,17 @@ class WP {
break;
}
}
// If req_uri is empty, the home page was requested. Unset error.
if ( empty($req_uri) ) {
if (isset($_GET['error'])) {
unset($_GET['error']);
}
if (isset($error)) {
unset($error);
}
}
}
}
@ -1508,6 +1519,9 @@ class WP {
else
$this->query_vars[$wpvar] = '';
}
if ( isset($error) )
$this->query_vars['error'] = $error;
}
function send_headers() {
@ -1602,12 +1616,10 @@ class WP {
// issue a 404 if one was already issued, if the request was a search,
// or if the request was a regular query string request rather than a
// permalink request.
if ( (0 == count($wp_query->posts)) && !is_404() && !is_search()
&& ( $this->did_permalink || (!empty($_SERVER['QUERY_STRING']) &&
(false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) {
if ( (0 == count($wp_query->posts)) && !is_404() && !is_search() && ( $this->did_permalink || (!empty($_SERVER['QUERY_STRING']) && (false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) {
$wp_query->set_404();
status_header( 404 );
} else {
} elseif( is_404() != true ) {
status_header( 200 );
}
}