From cf4686e4b6a0d3ccdc622dba3790e702e14db910 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Mon, 10 Feb 2025 15:01:23 +0000 Subject: [PATCH] Cron API: Clear the `recovery_mode_clean_expired_keys` cron event when converting a single site installation to Multisite. This cron event is not used when Multisite is in use. Props debarghyabanerjee, johnbillion, narenin Fixes #61450 Built from https://develop.svn.wordpress.org/trunk@59798 git-svn-id: http://core.svn.wordpress.org/trunk@59140 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/schema.php | 5 +++++ wp-includes/version.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index a7256c828a..011895f06c 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -1047,6 +1047,11 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam ) ); + // Remove the cron event since Recovery Mode is not used in Multisite. + if ( wp_next_scheduled( 'recovery_mode_clean_expired_keys' ) ) { + wp_clear_scheduled_hook( 'recovery_mode_clean_expired_keys' ); + } + /* * When upgrading from single to multisite, assume the current site will * become the main site of the network. When using populate_network() diff --git a/wp-includes/version.php b/wp-includes/version.php index 90dea1506a..75839bd73a 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.8-alpha-59797'; +$wp_version = '6.8-alpha-59798'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.