Changeset 14155

Timestamp:

04/18/2010 03:54:45 PM (16 years ago)

Author:

nacin

Message:

Use is_post_type_hierarchical and is_taxonomy_hierarchical when we're fetching a post/tax object only to check the hierarchical flag. fixes #12950.

Location:

trunk

Files:

• wp-admin/includes/post.php (modified) (4 diffs)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/rewrite.php (modified) (1 diff)

trunk/wp-admin/includes/post.php

@@ -269 +269 @@
                         if ( empty($terms) )
                                 continue;
-                        $taxonomy = get_taxonomy( $tax_name );
-                        if ( $taxonomy->hierarchical )
+                        if ( is_taxonomy_hierarchical( $tax_name ) )
                                 $tax_input[$tax_name] = array_map( 'absint', $terms );
                         else {
@@ -317 +316 @@
                 foreach ( $tax_names as $tax_name ) {
                         if( isset( $tax_input[$tax_name])  ) {
-                                $taxonomy = get_taxonomy( $tax_name );
-                                if( $taxonomy->hierarchical )
+                                if ( is_taxonomy_hierarchical( $tax_name ) )
                                         $terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
                                 else
@@ -862 +860 @@
         else
                 $post_type = 'post';
-        $post_type_object = get_post_type_object($post_type);
 
         $avail_post_stati = get_available_post_statuses($post_type);
@@ -892 +889 @@
 
         // Hierarchical types require special args.
-        if ( $post_type_object->hierarchical ) {
+        if ( is_post_type_hierarchical( $post_type ) ) {
                 $query['orderby'] = 'menu_order title';
                 $query['order'] = 'asc';

trunk/wp-includes/post.php

@@ -2511 +2511 @@
         // Hierarchical taxonomies must always pass IDs rather than names so that children with the same
         // names but different parents aren't confused.
-        $taxonomy_obj = get_taxonomy( $taxonomy );
-        if ( $taxonomy_obj->hierarchical ) {
+        if ( is_taxonomy_hierarchical( $taxonomy ) ) {
                 $tags = array_map( 'intval', $tags );
                 $tags = array_unique( $tags );

trunk/wp-includes/rewrite.php

@@ -1437 +1437 @@
                                         foreach ( get_post_types( array('_builtin' => false ) ) as $ptype ) {
                                                 if ( strpos($struct, "%$ptype%") !== false ) {
-                                                        $ptype = get_post_type_object($ptype);
                                                         $post = true;
-                                                        $page = $ptype->hierarchical; // This is for page style attachment url's
+                                                        $page = is_post_type_hierarchical( $ptype ); // This is for page style attachment url's
                                                         break;
                                                 }