From d69165bd3b233a5c26dd3ffbff39159a1fd6d48e Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 28 Mar 2019 14:31:51 +0000
Subject: [PATCH] Site Health: Correct `wp_version_check()` existence
 verification by performing a request to the Site Health page instead of
 Dashboard.

Props Clorith, audrasjb.
Fixes #46616.
Built from https://develop.svn.wordpress.org/trunk@45049


git-svn-id: http://core.svn.wordpress.org/trunk@44858 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-site-health-auto-updates.php | 2 +-
 wp-admin/includes/class-wp-site-health.php              | 2 --
 wp-admin/site-health.php                                | 3 +++
 wp-includes/version.php                                 | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/class-wp-site-health-auto-updates.php b/wp-admin/includes/class-wp-site-health-auto-updates.php
index b445fd5f59..57511b3317 100644
--- a/wp-admin/includes/class-wp-site-health-auto-updates.php
+++ b/wp-admin/includes/class-wp-site-health-auto-updates.php
@@ -101,7 +101,7 @@ class WP_Site_Health_Auto_Updates {
 			array(
 				'health-check-test-wp_version_check' => true,
 			),
-			admin_url()
+			admin_url( 'site-health.php' )
 		);
 
 		$test = wp_remote_get( $url, compact( 'cookies', 'headers', 'timeout' ) );
diff --git a/wp-admin/includes/class-wp-site-health.php b/wp-admin/includes/class-wp-site-health.php
index 3921e8f734..d5cd8a980c 100644
--- a/wp-admin/includes/class-wp-site-health.php
+++ b/wp-admin/includes/class-wp-site-health.php
@@ -28,8 +28,6 @@ class WP_Site_Health {
 	public function __construct() {
 		$this->prepare_sql_data();
 
-		add_action( 'wp_loaded', array( $this, 'check_wp_version_check_exists' ) );
-
 		add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
 
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
diff --git a/wp-admin/site-health.php b/wp-admin/site-health.php
index 5c713f6075..2457cc3eee 100644
--- a/wp-admin/site-health.php
+++ b/wp-admin/site-health.php
@@ -27,6 +27,9 @@ if ( ! class_exists( 'WP_Site_Health' ) ) {
 
 $health_check_site_status = new WP_Site_Health();
 
+// Start by checking if this is a special request checking for the existence of certain filters.
+$health_check_site_status->check_wp_version_check_exists();
+
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3087fc2631..6defedf32d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.2-beta1-45048';
+$wp_version = '5.2-beta1-45049';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.