<!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>[14155] trunk:
Use is_post_type_hierarchical and is_taxonomy_hierarchical when we'
re fetching a post/tax object only to check the hierarchical flag.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14155">14155</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-18 15:54:45 +0000 (Sun, 18 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is_post_type_hierarchical and is_taxonomy_hierarchical when we're fetching a post/tax object only to check the hierarchical flag. fixes <a href="http://trac.wordpress.org/ticket/12950">#12950</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (14154 => 14155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-04-18 15:32:39 UTC (rev 14154)
+++ trunk/wp-admin/includes/post.php 2010-04-18 15:54:45 UTC (rev 14155)
</span><span class="lines">@@ -268,8 +268,7 @@
</span><span class="cx"> foreach ( $post_data['tax_input'] as $tax_name => $terms ) {
</span><span class="cx"> if ( empty($terms) )
</span><span class="cx"> continue;
</span><del>- $taxonomy = get_taxonomy( $tax_name );
- if ( $taxonomy->hierarchical )
</del><ins>+ if ( is_taxonomy_hierarchical( $tax_name ) )
</ins><span class="cx"> $tax_input[$tax_name] = array_map( 'absint', $terms );
</span><span class="cx"> else {
</span><span class="cx"> $tax_input[$tax_name] = preg_replace( '/\s*,\s*/', ',', rtrim( trim($terms), ' ,' ) );
</span><span class="lines">@@ -316,8 +315,7 @@
</span><span class="cx">
</span><span class="cx"> foreach ( $tax_names as $tax_name ) {
</span><span class="cx"> if( isset( $tax_input[$tax_name]) ) {
</span><del>- $taxonomy = get_taxonomy( $tax_name );
- if( $taxonomy->hierarchical )
</del><ins>+ if ( is_taxonomy_hierarchical( $tax_name ) )
</ins><span class="cx"> $terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
</span><span class="cx"> else
</span><span class="cx"> $terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
</span><span class="lines">@@ -861,7 +859,6 @@
</span><span class="cx"> $post_type = $q['post_type'];
</span><span class="cx"> else
</span><span class="cx"> $post_type = 'post';
</span><del>- $post_type_object = get_post_type_object($post_type);
</del><span class="cx">
</span><span class="cx"> $avail_post_stati = get_available_post_statuses($post_type);
</span><span class="cx">
</span><span class="lines">@@ -891,7 +888,7 @@
</span><span class="cx"> $query = compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page');
</span><span class="cx">
</span><span class="cx"> // Hierarchical types require special args.
</span><del>- if ( $post_type_object->hierarchical ) {
</del><ins>+ if ( is_post_type_hierarchical( $post_type ) ) {
</ins><span class="cx"> $query['orderby'] = 'menu_order title';
</span><span class="cx"> $query['order'] = 'asc';
</span><span class="cx"> $query['posts_per_page'] = -1;
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (14154 => 14155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-04-18 15:32:39 UTC (rev 14154)
+++ trunk/wp-includes/post.php 2010-04-18 15:54:45 UTC (rev 14155)
</span><span class="lines">@@ -2510,8 +2510,7 @@
</span><span class="cx">
</span><span class="cx"> // Hierarchical taxonomies must always pass IDs rather than names so that children with the same
</span><span class="cx"> // names but different parents aren't confused.
</span><del>- $taxonomy_obj = get_taxonomy( $taxonomy );
- if ( $taxonomy_obj->hierarchical ) {
</del><ins>+ if ( is_taxonomy_hierarchical( $taxonomy ) ) {
</ins><span class="cx"> $tags = array_map( 'intval', $tags );
</span><span class="cx"> $tags = array_unique( $tags );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (14154 => 14155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php 2010-04-18 15:32:39 UTC (rev 14154)
+++ trunk/wp-includes/rewrite.php 2010-04-18 15:54:45 UTC (rev 14155)
</span><span class="lines">@@ -1436,9 +1436,8 @@
</span><span class="cx"> // For custom post types, we need to add on endpoints as well.
</span><span class="cx"> foreach ( get_post_types( array('_builtin' => false ) ) as $ptype ) {
</span><span class="cx"> if ( strpos($struct, "%$ptype%") !== false ) {
</span><del>- $ptype = get_post_type_object($ptype);
</del><span class="cx"> $post = true;
</span><del>- $page = $ptype->hierarchical; // This is for page style attachment url's
</del><ins>+ $page = is_post_type_hierarchical( $ptype ); // This is for page style attachment url's
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>