<!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>[16818] trunk/wp-includes: Do not do slug logging/
 redirects for hierarchical post types.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16818">16818</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-12-08 21:10:38 +0000 (Wed, 08 Dec 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Do not do slug logging/redirects for hierarchical post types. see <a href="http://trac.wordpress.org/ticket/15140">#15140</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (16817 => 16818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php        2010-12-08 21:09:29 UTC (rev 16817)
+++ trunk/wp-includes/post.php        2010-12-08 21:10:38 UTC (rev 16818)
</span><span class="lines">@@ -4024,8 +4024,9 @@
</span><span class="cx">         if ( $post-&gt;post_name == $post_before-&gt;post_name )
</span><span class="cx">                 return;
</span><span class="cx"> 
</span><del>-        // we're only concerned with published objects
-        if ( $post-&gt;post_status != 'publish' )
</del><ins>+        // we're only concerned with published, non-hierarchical objects
+        $ptype_obj = get_post_type_object( $post-&gt;post_type );
+        if ( $post-&gt;post_status != 'publish' || !$ptype_obj || $ptype_obj-&gt;hierarchical )
</ins><span class="cx">                 return;
</span><span class="cx"> 
</span><span class="cx">         $old_slugs = (array) get_post_meta($post_id, '_wp_old_slug');
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (16817 => 16818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php        2010-12-08 21:09:29 UTC (rev 16817)
+++ trunk/wp-includes/query.php        2010-12-08 21:10:38 UTC (rev 16818)
</span><span class="lines">@@ -3231,6 +3231,11 @@
</span><span class="cx">                 else
</span><span class="cx">                         $post_type = 'post';
</span><span class="cx"> 
</span><ins>+                // Do not attempt redirect for hierarchical post types
+                $ptype_obj = get_post_type_object( $post_type );
+                if ( !$ptype_obj || $ptype_obj-&gt;hierarchical )
+                        return;
+
</ins><span class="cx">                 $query = $wpdb-&gt;prepare(&quot;SELECT post_id FROM $wpdb-&gt;postmeta, $wpdb-&gt;posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_slug' AND meta_value = %s&quot;, $post_type, $wp_query-&gt;query_vars['name']);
</span><span class="cx"> 
</span><span class="cx">                 // if year, monthnum, or day have been specified, make our query more precise
</span></span></pre>
</div>
</div>

</body>
</html>