From 1b3f89d510b29490bfdc8f24bd29cd96e33d8985 Mon Sep 17 00:00:00 2001
From: Michael <github@michaelplas.de>
Date: Fri, 8 Sep 2023 00:38:22 +0200
Subject: [PATCH] Unschedule wp_https_detection. $wp_db_version might be changed by core committer
---
src/wp-admin/includes/upgrade.php | 24 ++++++++++++++++++++++++
src/wp-includes/version.php | 2 +-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index 23653d1c2b..f18aa0129c 100644
a
|
b
|
function upgrade_all() { |
840 | 840 | upgrade_630(); |
841 | 841 | } |
842 | 842 | |
| 843 | if ( $wp_current_db_version < 56544 ) { |
| 844 | upgrade_640(); |
| 845 | } |
| 846 | |
843 | 847 | maybe_disable_link_manager(); |
844 | 848 | |
845 | 849 | maybe_disable_automattic_widgets(); |
… |
… |
function upgrade_630() { |
2326 | 2330 | } |
2327 | 2331 | } |
2328 | 2332 | |
| 2333 | /** |
| 2334 | * Executes changes made in WordPress 6.4.0. |
| 2335 | * |
| 2336 | * @ignore |
| 2337 | * @since 6.4.0 |
| 2338 | * |
| 2339 | * @global int $wp_current_db_version The old (current) database version. |
| 2340 | */ |
| 2341 | function upgrade_640() { |
| 2342 | global $wp_current_db_version; |
| 2343 | |
| 2344 | if ( $wp_current_db_version < 56544 ) { |
| 2345 | // Remove wp_https_detection, which is now part of a async site health check |
| 2346 | $scheduled = wp_get_scheduled_event( 'wp_https_detection' ); |
| 2347 | if ( $scheduled ) { |
| 2348 | wp_clear_scheduled_hook('wp_https_detection'); |
| 2349 | } |
| 2350 | } |
| 2351 | } |
| 2352 | |
2329 | 2353 | /** |
2330 | 2354 | * Executes network-level upgrade routines. |
2331 | 2355 | * |
diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php
index a58fa72d4b..a90511190a 100644
a
|
b
|
$wp_version = '6.4-alpha-56267-src'; |
23 | 23 | * |
24 | 24 | * @global int $wp_db_version |
25 | 25 | */ |
26 | | $wp_db_version = 55853; |
| 26 | $wp_db_version = 56544; |
27 | 27 | |
28 | 28 | /** |
29 | 29 | * Holds the TinyMCE version. |