From cb9c2ae83fb99f17da0e22562c8aff0b70e8295a Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 26 Jun 2020 22:31:08 +0000
Subject: [PATCH] Taxonomy: Make sure `update_object_term_cache()` caches all
 terms that were not already cached.

Due to an unintended `break` instruction from a previous iteration, the function cached only one term in each taxonomy.

Follow-up to [48055].

Props Chouby.
Fixes #50352.
Built from https://develop.svn.wordpress.org/trunk@48187


git-svn-id: http://core.svn.wordpress.org/trunk@47956 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/taxonomy.php | 3 ++-
 wp-includes/version.php  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index eaa380a1bd..9c4dc5f76d 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -3418,7 +3418,6 @@ function update_object_term_cache( $object_ids, $object_type ) {
 		foreach ( $cache_values as $id => $value ) {
 			if ( false === $value ) {
 				$non_cached_ids[] = $id;
-				break;
 			}
 		}
 	}
@@ -3427,6 +3426,8 @@ function update_object_term_cache( $object_ids, $object_type ) {
 		return false;
 	}
 
+	$non_cached_ids = array_unique( $non_cached_ids );
+
 	$terms = wp_get_object_terms(
 		$non_cached_ids,
 		$taxonomies,
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9b7810c849..91e00db4af 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-48186';
+$wp_version = '5.5-alpha-48187';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.