Ticket #18968: 18968.diff

src/wp-admin/includes/taxonomy.php

@@ -234 +234 @@
         if ( !$post_id )
                 return false;
 
-        $tags = wp_get_post_terms($post_id, $taxonomy, array());
+        $terms = get_object_term_cache( $post_id, $taxonomy );
+        if ( false === $terms ) {
+                $terms = wp_get_object_terms( $post_id, $taxonomy );
+                wp_cache_add( $post_id, $terms, $taxonomy . '_relationships' );
+        }
 
-        if ( !$tags ) {
+        if ( ! $terms ) {
                 return false;
         }
-        if ( is_wp_error($tags) ) {
-                return $tags;
+        if ( is_wp_error( $terms ) ) {
+                return $terms;
         }
-        $tag_names = array();
-        foreach ( $tags as $tag ) {
-                $tag_names[] = $tag->name;
+        $term_names = array();
+        foreach ( $terms as $term ) {
+                $term_names[] = $term->name;
         }
 
-        $tags_to_edit = esc_attr( join( ',', $tag_names ) );
+        $terms_to_edit = esc_attr( join( ',', $term_names ) );
 
         /**
          * Filter the comma-separated list of terms available to edit.
@@ -256 +260 @@
          *
          * @see get_terms_to_edit()
          *
-         * @param array  $tags_to_edit An array of terms.
+         * @param array  $terms_to_edit An array of terms.
          * @param string $taxonomy     The taxonomy for which to retrieve terms. Default 'post_tag'.
          */
-        $tags_to_edit = apply_filters( 'terms_to_edit', $tags_to_edit, $taxonomy );
+        $terms_to_edit = apply_filters( 'terms_to_edit', $terms_to_edit, $taxonomy );
 
-        return $tags_to_edit;
+        return $terms_to_edit;
 }
 
 /**

src/wp-admin/includes/template.php

@@ -364 +364 @@
                 $taxonomy = get_taxonomy( $taxonomy_name );
 
                 if ( $taxonomy->hierarchical && $taxonomy->show_ui ) {
-                                echo '<div class="post_category" id="' . $taxonomy_name . '_' . $post->ID . '">'
-                                        . implode( ',', wp_get_object_terms( $post->ID, $taxonomy_name, array( 'fields' => 'ids' ) ) ) . '</div>';
+
+                        $terms = get_object_term_cache( $post->ID, $taxonomy_name );
+                        if ( false === $terms ) {
+                                $terms = wp_get_object_terms( $post->ID, $taxonomy_name );
+                                wp_cache_add( $post->ID, $terms, $taxonomy_name . '_relationships' );
+                        }
+                        $term_ids = empty( $terms ) ? array() : wp_list_pluck( $terms, 'term_id' );
+
+                        echo '<div class="post_category" id="' . $taxonomy_name . '_' . $post->ID . '">' . implode( ',', $term_ids ) . '</div>';
+
                 } elseif ( $taxonomy->show_ui ) {
+
                         echo '<div class="tags_input" id="'.$taxonomy_name.'_'.$post->ID.'">'
                                 . esc_html( str_replace( ',', ', ', get_terms_to_edit( $post->ID, $taxonomy_name ) ) ) . '</div>';
+
                 }
         }