Changeset 22722

Timestamp:

11/20/2012 06:31:06 PM (13 years ago)

Author:

ryan

Message:

Don't bail from get_the_terms() if the post type is not registed for the taxonomy. This can break back compat when add_post_type_support( 'page', 'post-formats' ) is called but register_taxonomy_for_object_type( 'postr_-format', 'page' ) is not.

Props SergeyBiryukov
fixes #22473

Location:

trunk/wp-includes

Files:

• category-template.php (modified) (1 diff)
• post.php (modified) (2 diffs)

trunk/wp-includes/category-template.php

@@ -1063 +1063 @@
         return false;
 
-    if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) )
-        return false;
-
     $terms = get_object_term_cache( $post->ID, $taxonomy );
     if ( false === $terms ) {

trunk/wp-includes/post.php

@@ -616 +616 @@
 
         if ( 'post_category' == $key ) {
-            $terms = get_the_terms( $this, 'category' );
-            if ( ! $terms )
+            if ( is_object_in_taxonomy( $this->post_type, 'category' ) )
+                $terms = get_the_terms( $this, 'category' );
+
+            if ( empty( $terms ) )
                 return array();
 
@@ -624 +626 @@
 
         if ( 'tags_input' == $key ) {
-            $terms = get_the_terms( $this, 'post_tag' );
-            if ( ! $terms )
+            if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) )
+                $terms = get_the_terms( $this, 'post_tag' );
+
+            if ( empty( $terms ) )
                 return array();