Changeset 28561

Timestamp:

05/23/2014 07:28:45 PM (11 years ago)

Author:

wonderboymusic

Message:

In get_terms_to_edit(), call get_object_term_cache() before priming cache with wp_get_object_terms().

In get_inline_data(), do the same.

On list table screens with taxonomies in the admin, this dramatically reduces the number of database queries (3x less). Even more so with a persistent object cache (5x less).

Props johnbillion, jeffstieler, wonderboymusic.
Fixes #18968.

Location:

trunk/src/wp-admin/includes

Files:

• taxonomy.php (modified) (2 diffs)
• template.php (modified) (1 diff)

trunk/src/wp-admin/includes/taxonomy.php

@@ -235 +235 @@
         return false;
 
-    $tags = wp_get_post_terms($post_id, $taxonomy, array());
-
-    if ( !$tags ) {
+    $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 ( ! $terms ) {
         return false;
     }
-    if ( is_wp_error($tags) ) {
-        return $tags;
-    }
-    $tag_names = array();
-    foreach ( $tags as $tag ) {
-        $tag_names[] = $tag->name;
-    }
-
-    $tags_to_edit = esc_attr( join( ',', $tag_names ) );
+    if ( is_wp_error( $terms ) ) {
+        return $terms;
+    }
+    $term_names = array();
+    foreach ( $terms as $term ) {
+        $term_names[] = $term->name;
+    }
+
+    $terms_to_edit = esc_attr( join( ',', $term_names ) );
 
     /**
@@ -257 +261 @@
      * @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 );
-
-    return $tags_to_edit;
+    $terms_to_edit = apply_filters( 'terms_to_edit', $terms_to_edit, $taxonomy );
+
+    return $terms_to_edit;
 }
 

trunk/src/wp-admin/includes/template.php

@@ -365 +365 @@
 
         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>';
+
         }
     }