Ticket #21309: get_the_terms.21309.2.diff

wp-includes/category-template.php

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

wp-includes/post.php

@@ -495 +495 @@
                 }
 
                 if ( 'post_category' == $key ) {
-                        if ( is_object_in_taxonomy( $this->post_type, 'category' ) )
-                                return wp_get_post_categories( $this->ID );
-                        else
+                        $terms = get_the_terms( $this, 'category' );
+                        if ( !$terms )
                                 return array();
+
+                        return wp_list_pluck( $terms, 'term_id' );
                 }
 
                 if ( 'tags_input' == $key ) {
-                        if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) )
-                                return wp_get_post_tags( $this->ID, array( 'fields' => 'names' ) );
-                        else
+                        $terms = get_the_terms( $this, 'post_tag' );
+                        if ( !$terms )
                                 return array();
+
+                        return wp_list_pluck( $terms, 'name' );
                 }
 
                 // Rest of the values need filtering
@@ -3043 +3045 @@
         // Hierarchical taxonomies must always pass IDs rather than names so that children with the same
         // names but different parents aren't confused.
         if ( is_taxonomy_hierarchical( $taxonomy ) ) {
-                $tags = array_map( 'intval', $tags );
-                $tags = array_unique( $tags );
+                $tags = array_unique( array_map( 'intval', $tags ) );
         }
 
-        return wp_set_object_terms($post_id, $tags, $taxonomy, $append);
+        $r = wp_set_object_terms( $post_id, $tags, $taxonomy, $append );
+        if ( is_wp_error( $r ) )
+                return $r;
+
+        wp_cache_delete( $post_id, $taxonomy . '_relationships' );
+
+        return $r;
 }
 
 /**
@@ -3076 +3083 @@
                 return true;
         }
 
-        if ( !empty($post_categories) ) {
-                $post_categories = array_map('intval', $post_categories);
-                $post_categories = array_unique($post_categories);
-        }
-
-        return wp_set_object_terms($post_ID, $post_categories, 'category');
+        return wp_set_post_terms($post_ID, $post_categories, 'category');
 }
 
 /**