From 6d1ed93c915d344f9c99642ccce3cef532e8b9da Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 2 Dec 2019 14:49:01 +0000
Subject: [PATCH] Taxonomy: Remove redundant caching from
 `get_all_category_ids()`, deprecated in favor of `get_terms()` in [28679].

The `all_category_ids` cache key it relied on was removed in [5555] and never repopulated, causing invalid or unexpected results when using a persistent object cache.

Props itowhid06, johnjamesjacoby.
Fixes #48176.
Built from https://develop.svn.wordpress.org/trunk@46810


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

diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index 98da670cc1..9230525b3c 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -1286,16 +1286,13 @@ function get_category_children( $id, $before = '/', $after = '', $visited = arra
 function get_all_category_ids() {
 	_deprecated_function( __FUNCTION__, '4.0.0', 'get_terms()' );
 
-	if ( ! $cat_ids = wp_cache_get( 'all_category_ids', 'category' ) ) {
-		$cat_ids = get_terms(
-			array(
-				'taxonomy' => 'category',
-				'fields'   => 'ids',
-				'get'      => 'all',
-			)
-		);
-		wp_cache_add( 'all_category_ids', $cat_ids, 'category' );
-	}
+	$cat_ids = get_terms(
+		array(
+			'taxonomy' => 'category',
+			'fields'   => 'ids',
+			'get'      => 'all',
+		)
+	);
 
 	return $cat_ids;
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1e2c74cc48..d14718b6aa 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-46809';
+$wp_version = '5.4-alpha-46810';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.