From 69962171e95658f23f9e72e2d00041b5c5f295d9 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 8 Oct 2025 03:02:34 +0000
Subject: [PATCH] Networks and Sites: Remove obsolete code from
 `wp-activate.php`.

The `WP_Object_Cache::$cache_enabled` property does not exist in core as of WordPress 2.5, and has no meaningful usage in external object cache implementations.

This check was originally added for debugging purposes, and is now a remnant from the WPMU merge.

Follow-up to [6539], [https://mu.trac.wordpress.org/changeset/1298 mu:1298], [https://mu.trac.wordpress.org/changeset/1319 mu:1319], [12603].

Props skithund, jrf, snehapatil02, debarghyabanerjee, tillkruess, audrasjb, spacedmonkey, desrosj, rollybueno, SergeyBiryukov.
Fixes #61675.
Built from https://develop.svn.wordpress.org/trunk@60914


git-svn-id: http://core.svn.wordpress.org/trunk@60250 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-activate.php         | 4 ----
 wp-includes/version.php | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/wp-activate.php b/wp-activate.php
index f4fd8d76c3..0c3321f746 100644
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -64,10 +64,6 @@ if ( null === $result || ( is_wp_error( $result ) && 'invalid_key' === $result->
 
 nocache_headers();
 
-if ( is_object( $wp_object_cache ) ) {
-	$wp_object_cache->cache_enabled = false;
-}
-
 // Fix for page title.
 $wp_query->is_404 = false;
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 90c0e95f7c..ca6e84f93a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.9-alpha-60913';
+$wp_version = '6.9-alpha-60914';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.