From fbfc86fc22b4df0c636b05e5ce5da0b548fd5b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20Kru=CC=88ss?= Date: Sun, 27 Sep 2020 19:40:03 -0700 Subject: [PATCH] revert #273; it breaks multisite keys --- includes/object-cache.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/includes/object-cache.php b/includes/object-cache.php index 8074e796..245206d7 100644 --- a/includes/object-cache.php +++ b/includes/object-cache.php @@ -1779,18 +1779,10 @@ function ( $keys ) { * @return string */ public function build_key( $key, $group = 'default' ) { - static $keys = []; - if ( empty( $group ) ) { $group = 'default'; } - $key_index = "{$key}:{$group}"; - - if ( isset( $keys[ $key_index ] ) ) { - return $keys[ $key_index ]; - } - $salt = defined( 'WP_REDIS_PREFIX' ) ? trim( WP_REDIS_PREFIX ) : ''; $prefix = $this->is_global_group( $group ) ? $this->global_prefix : $this->blog_prefix; @@ -1799,7 +1791,7 @@ public function build_key( $key, $group = 'default' ) { $prefix = trim( $prefix, '_-:$' ); - return $keys[ $key_index ] = "{$salt}{$prefix}:{$group}:{$key}"; + return "{$salt}{$prefix}:{$group}:{$key}"; } /**