Changeset 54893 for branches/6.1/src/wp-includes/post.php

Timestamp:

11/29/2022 08:25:02 PM (3 years ago)

Author:

ocean90

Message:

Revert [54892] from the 6.1 branch.

This will be added again once committed to trunk first.

See #57163.

File:

• branches/6.1/src/wp-includes/post.php (modified) (4 diffs)

branches/6.1/src/wp-includes/post.php

@@ -7823 +7823 @@
     $post_type_taxonomies = array();
     $term_ids             = array();
-    $prime_post_terms     = array();
     foreach ( $posts as $post ) {
         if ( ! ( $post instanceof WP_Post ) ) {
@@ -7833 +7832 @@
         }
 
-        foreach ( $post_type_taxonomies[ $post->post_type ] as $taxonomy ) {
-            $prime_post_terms[ $taxonomy ][] = $post->ID;
-        }
-    }
-
-    foreach ( $prime_post_terms as $taxonomy => $post_ids ){
-        wp_cache_get_multiple( $post_ids, "{$taxonomy}_relationships" );
-    }
-
-    foreach ( $posts as $post ) {
         foreach ( $post_type_taxonomies[ $post->post_type ] as $taxonomy ) {
             // Term cache should already be primed by `update_post_term_cache()`.
@@ -7889 +7878 @@
  * @since 6.1.0 This function is no longer marked as "private".
  *
- * @see update_post_cache()
- * @see update_postmeta_cache()
- * @see update_object_term_cache()
+ * @see update_post_caches()
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -7906 +7893 @@
         $fresh_posts = $wpdb->get_results( sprintf( "SELECT $wpdb->posts.* FROM $wpdb->posts WHERE ID IN (%s)", implode( ',', $non_cached_ids ) ) );
 
-        if ( $fresh_posts ) {
-            // Despite the name, update_post_cache() expects an array rather than a single post.
-            update_post_cache( $fresh_posts );
-        }
-    }
-
-    if ( $update_meta_cache ) {
-        update_postmeta_cache( $ids );
-    }
-
-    if ( $update_term_cache ) {
-        $post_types = array_map( 'get_post_type', $ids );
-        $post_types = array_unique( $post_types );
-        update_object_term_cache( $ids, $post_types );
+        update_post_caches( $fresh_posts, 'any', $update_term_cache, $update_meta_cache );
     }
 }