<!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" />
<title>[21112] trunk/wp-includes: Set $walk_dirs = true for post rewrite rule generation.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21112">21112</a></dd>
<dt>Author</dt> <dd>duck_</dd>
<dt>Date</dt> <dd>2012-06-25 20:41:14 +0000 (Mon, 25 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set $walk_dirs = true for post rewrite rule generation. See <a href="http://core.trac.wordpress.org/ticket/21020">#21020</a> for trunk.
Partial revert of r19737 and r19778 as some users were relying on this behaviour.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (21111 => 21112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2012-06-25 20:30:59 UTC (rev 21111)
+++ trunk/wp-includes/canonical.php 2012-06-25 20:41:14 UTC (rev 21112)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! $redirect_url ) {
</span><del>- if ( $redirect_url = redirect_guess_404_permalink( $requested_url ) ) {
</del><ins>+ if ( $redirect_url = redirect_guess_404_permalink() ) {
</ins><span class="cx"> $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'page', 'feed', 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -461,31 +461,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Attempts to guess the correct URL from the current URL (that produced a 404) or
- * the current query variables.
</del><ins>+ * Attempts to guess the correct URL based on query vars
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.3.0
</span><span class="cx"> * @uses $wpdb
</span><span class="cx"> *
</span><del>- * @param string $current_url Optional. The URL that has 404'd.
</del><span class="cx"> * @return bool|string The correct URL if one is found. False on failure.
</span><span class="cx"> */
</span><del>-function redirect_guess_404_permalink( $current_url = '' ) {
</del><ins>+function redirect_guess_404_permalink() {
</ins><span class="cx"> global $wpdb, $wp_rewrite;
</span><span class="cx">
</span><del>- if ( ! empty( $current_url ) )
- $parsed_url = @parse_url( $current_url );
-
- // Attempt to redirect bare category slugs if the permalink structure starts
- // with the %category% tag.
- if ( isset( $parsed_url['path'] )
- && preg_match( '#^[^%]+%category%#', $wp_rewrite->permalink_structure )
- && $cat = get_category_by_path( $parsed_url['path'] )
- ) {
- if ( ! is_wp_error( $cat ) )
- return get_term_link( $cat );
- }
-
</del><span class="cx"> if ( get_query_var('name') ) {
</span><span class="cx"> $where = $wpdb->prepare("post_name LIKE %s", like_escape( get_query_var('name') ) . '%');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (21111 => 21112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php 2012-06-25 20:30:59 UTC (rev 21111)
+++ trunk/wp-includes/rewrite.php 2012-06-25 20:41:14 UTC (rev 21112)
</span><span class="lines">@@ -1537,7 +1537,7 @@
</span><span class="cx"> $registration_pages['.*wp-register.php$'] = $this->index . '?register=true'; // Deprecated
</span><span class="cx">
</span><span class="cx"> // Post
</span><del>- $post_rewrite = $this->generate_rewrite_rules( $this->permalink_structure, EP_PERMALINK, false, true, false, false );
</del><ins>+ $post_rewrite = $this->generate_rewrite_rules( $this->permalink_structure, EP_PERMALINK, false );
</ins><span class="cx"> $post_rewrite = apply_filters('post_rewrite_rules', $post_rewrite);
</span><span class="cx">
</span><span class="cx"> // Date
</span></span></pre>
</div>
</div>
</body>
</html>