<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13315] trunk/wp-includes/classes.php: Serve a real 404 for ?p=
does-not-exist, ?cat=does-not-exist, etc.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13315">13315</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-02-22 22:54:21 +0000 (Mon, 22 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Serve a real 404 for ?p=does-not-exist, ?cat=does-not-exist, etc. fixes <a href="http://trac.wordpress.org/ticket/12250">#12250</a>. fixes <a href="http://trac.wordpress.org/ticket/10930">#10930</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (13314 => 13315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-02-22 22:53:54 UTC (rev 13314)
+++ trunk/wp-includes/classes.php 2010-02-22 22:54:21 UTC (rev 13315)
</span><span class="lines">@@ -461,21 +461,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set the Headers for 404, if permalink is not found.
</del><ins>+ * Set the Headers for 404, if nothing is found for requested URL.
</ins><span class="cx"> *
</span><del>- * Issue a 404 if a permalink request doesn't match any posts. Don't 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. Issues a 200, if not 404.
</del><ins>+ * Issue a 404 if a request doesn't match any posts and doesn't match
+ * any object (e.g. an existing-but-empty category, tag, author) and a 404 was not already
+ * issued, and if the request was not a search or the homepage.
</ins><span class="cx"> *
</span><ins>+ * Otherwise, issue a 200.
+ *
</ins><span class="cx"> * @since 2.0.0
</span><span class="cx"> */
</span><span class="cx"> function handle_404() {
</span><span class="cx"> global $wp_query;
</span><span class="cx">
</span><del>- if ( (0 == count($wp_query->posts)) && !is_404() && !is_robots() && !is_search() && ( $this->did_permalink || (!empty($_SERVER['QUERY_STRING']) && (false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) {
</del><ins>+ if ( ( 0 == count( $wp_query->posts ) ) && !is_404() && !is_search() && !is_home() ) {
</ins><span class="cx"> // Don't 404 for these queries if they matched an object.
</span><del>- if ( ( is_tag() || is_category() || is_author() ) && $wp_query->get_queried_object() ) {
</del><ins>+ if ( ( is_tag() || is_category() || is_tax() || is_author() ) && $wp_query->get_queried_object() ) {
</ins><span class="cx"> if ( !is_404() )
</span><span class="cx"> status_header( 200 );
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>