From 991114fb57ed48f2c2fb1e641be2a0d413d07cda Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Sun, 22 Nov 2020 13:03:06 +0000
Subject: [PATCH] Upgrade/Install: Replace the conditionals that check the
 `AUTOMATIC_UPDATER_DISABLED` constant and the `automatic_updater_disabled`
 filter in update-core.php with a call to
 `WP_Automatic_Updater::is_disabled()`. This prevents a PHP warning, fixes the
 logic, and considers `wp_is_file_mod_allowed( 'automatic_updater' )` when
 determining the UI state.

Props jamesros161, pbiron, audrasjb, azaozz.
Fixes #51827.
Built from https://develop.svn.wordpress.org/trunk@49677


git-svn-id: http://core.svn.wordpress.org/trunk@49400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/update-core.php | 27 +++++++++++++--------------
 wp-includes/version.php  |  2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 3beb87b6ed..c67ac9ace2 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -291,6 +291,9 @@ function core_auto_updates_settings() {
 		}
 	}
 
+	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+	$updater = new WP_Automatic_Updater();
+
 	// Defaults:
 	$upgrade_dev   = get_site_option( 'auto_update_core_dev', 'enabled' ) === 'enabled';
 	$upgrade_minor = get_site_option( 'auto_update_core_minor', 'enabled' ) === 'enabled';
@@ -323,18 +326,15 @@ function core_auto_updates_settings() {
 		$can_set_update_option = false;
 	}
 
-	if ( defined( 'AUTOMATIC_UPDATER_DISABLED' )
-		|| has_filter( 'automatic_updater_disabled' )
-	) {
-		if ( true === AUTOMATIC_UPDATER_DISABLED
-			/** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */
-			|| true === apply_filters( 'automatic_updater_disabled', false )
-		) {
-			$upgrade_dev   = false;
-			$upgrade_minor = false;
-			$upgrade_major = false;
-		}
-		// The UI is overridden by the AUTOMATIC_UPDATER_DISABLED constant.
+	if ( $updater->is_disabled() ) {
+		$upgrade_dev   = false;
+		$upgrade_minor = false;
+		$upgrade_major = false;
+
+		// The UI is overridden by the AUTOMATIC_UPDATER_DISABLED constant
+		// or the automatic_updater_disabled filter,
+		// or by wp_is_file_mod_allowed( 'automatic_updater' ).
+		// See WP_Automatic_Updater::is_disabled().
 		$can_set_update_option = false;
 	}
 
@@ -370,8 +370,7 @@ function core_auto_updates_settings() {
 
 	<p class="auto-update-status">
 		<?php
-		require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-		$updater = new WP_Automatic_Updater();
+
 		if ( $updater->is_vcs_checkout( ABSPATH ) ) {
 			_e( 'This site appears to be under version control. Automatic updates are disabled.' );
 		} elseif ( $upgrade_major ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a52e210383..0a43b11ab6 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-alpha-49676';
+$wp_version = '5.7-alpha-49677';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.