Changeset 21981

Timestamp:

09/24/2012 08:35:56 PM (12 years ago)

Author:

ryan

Message:

Fetch full terms for the post_category and tags_input queries and then wp_list_pluck() the desired fields. Fetching full terms primes the cache and reduces overall queries. Add cache invalidation to wp_set_post_terms(). Props scribu. see #21309

Location:

trunk/wp-includes

Files:

• category-template.php (modified) (1 diff)
• post.php (modified) (3 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

@@ -497 +497 @@
 
         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' );
         }
 
@@ -3042 +3044 @@
     // names but different parents aren't confused.
     if ( is_taxonomy_hierarchical( $taxonomy ) ) {
-        $tags = array_map( 'intval', $tags );
-        $tags = array_unique( $tags );
-    }
-
-    return wp_set_object_terms($post_id, $tags, $taxonomy, $append);
+        $tags = array_unique( array_map( 'intval', $tags ) );
+    }
+
+    $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;
 }
 
@@ -3075 +3082 @@
     }
 
-    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');
 }