golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Serve a real 404 for ?p=does-not-exist, ?cat=does-not-exist, etc. fixes #12250. fixes #10930. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2010-02-22 22:54:21 +00:00
parent 9a11f30898
commit c1b647bb52
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-includes/classes.php
View File

@ -461,21 +461,22 @@ class WP {
} }
/** /**
* Set the Headers for 404, if permalink is not found. * Set the Headers for 404, if nothing is found for requested URL.
* *
* Issue a 404 if a permalink request doesn't match any posts. Don't issue * Issue a 404 if a request doesn't match any posts and doesn't match
* a 404 if one was already issued, if the request was a search, or if the * any object (e.g. an existing-but-empty category, tag, author) and a 404 was not already
* request was a regular query string request rather than a permalink * issued, and if the request was not a search or the homepage.
* request. Issues a 200, if not 404. *
* Otherwise, issue a 200.
* *
* @since 2.0.0 * @since 2.0.0
*/ */
function handle_404() { function handle_404() {
global $wp_query; global $wp_query;
if ( (0 == count($wp_query->posts)) && !is_404() && !is_robots() && !is_search() && ( $this->did_permalink || (!empty($_SERVER['QUERY_STRING']) && (false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) { if ( ( 0 == count( $wp_query->posts ) ) && !is_404() && !is_search() && !is_home() ) {
// Don't 404 for these queries if they matched an object. // Don't 404 for these queries if they matched an object.
if ( ( is_tag() || is_category() || is_author() ) && $wp_query->get_queried_object() ) { if ( ( is_tag() || is_category() || is_tax() || is_author() ) && $wp_query->get_queried_object() ) {
if ( !is_404() ) if ( !is_404() )
status_header( 200 ); status_header( 200 );
return; return;