Changeset 49682 for branches/5.6

Timestamp:

11/22/2020 04:04:04 PM (6 years ago)

Author:

SergeyBiryukov

Message:

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.
Merges [49677] and [49681] to the 5.6 branch.
Fixes #51827.

Location:

branches/5.6

Files:

• . (modified) (1 prop)
• src/wp-admin/update-core.php (modified) (3 diffs)

branches/5.6/src/wp-admin/update-core.php

@@ -290 +290 @@
         }
 
+        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';
@@ -318 +321 @@
                 }
 
-                // The UI is overridden by the WP_AUTO_UPDATE_CORE constant.
+                // The UI is overridden by the `WP_AUTO_UPDATE_CORE` constant.
                 $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;
         }
 
-        // Is the UI overridden by a plugin using the allow_major_auto_core_updates filter?
+        // Is the UI overridden by a plugin using the `allow_major_auto_core_updates` filter?
         if ( has_filter( 'allow_major_auto_core_updates' ) ) {
                 $can_set_update_option = false;
@@ -369 +371 @@
         <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.' );