From 6ef5edd41f8e6cdd5bc372fc02489f7bb423d8d1 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 30 Jan 2021 10:32:10 +0000 Subject: [PATCH] Upgrade/Install: Allow WordPress sites to opt-in to development releases. The `WP_AUTO_UPDATE_CORE` constant now supports `development` and `branch-development` values. This makes it possible for sites to opt-in to updating to nightly builds without having to install a plugin. Follow-up to [49245], [49292]. Props xkon, knutsp, afragen, audrasjb, dd32. Fixes #51978. git-svn-id: https://develop.svn.wordpress.org/trunk@50082 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-core-upgrader.php | 5 ++--- src/wp-admin/includes/class-wp-site-health-auto-updates.php | 2 +- src/wp-admin/update-core.php | 5 ++--- src/wp-includes/update.php | 6 ++++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/wp-admin/includes/class-core-upgrader.php b/src/wp-admin/includes/class-core-upgrader.php index b57a13fd7b..7acbaaed49 100644 --- a/src/wp-admin/includes/class-core-upgrader.php +++ b/src/wp-admin/includes/class-core-upgrader.php @@ -283,7 +283,7 @@ class Core_Upgrader extends WP_Upgrader { $upgrade_minor = get_site_option( 'auto_update_core_minor', 'enabled' ) === 'enabled'; $upgrade_major = get_site_option( 'auto_update_core_major', 'unset' ) === 'enabled'; - // WP_AUTO_UPDATE_CORE = true (all), 'beta', 'rc', 'minor', false. + // WP_AUTO_UPDATE_CORE = true (all), 'beta', 'rc', 'development', 'branch-development', 'minor', false. if ( defined( 'WP_AUTO_UPDATE_CORE' ) ) { if ( false === WP_AUTO_UPDATE_CORE ) { // Defaults to turned off, unless a filter allows it. @@ -291,8 +291,7 @@ class Core_Upgrader extends WP_Upgrader { $upgrade_minor = false; $upgrade_major = false; } elseif ( true === WP_AUTO_UPDATE_CORE - || 'beta' === WP_AUTO_UPDATE_CORE - || 'rc' === WP_AUTO_UPDATE_CORE + || in_array( WP_AUTO_UPDATE_CORE, array( 'beta', 'rc', 'development', 'branch-development' ), true ) ) { // ALL updates for core. $upgrade_dev = true; diff --git a/src/wp-admin/includes/class-wp-site-health-auto-updates.php b/src/wp-admin/includes/class-wp-site-health-auto-updates.php index 11d2c2fb48..1ddaa05feb 100644 --- a/src/wp-admin/includes/class-wp-site-health-auto-updates.php +++ b/src/wp-admin/includes/class-wp-site-health-auto-updates.php @@ -27,7 +27,7 @@ class WP_Site_Health_Auto_Updates { */ public function run_tests() { $tests = array( - $this->test_constants( 'WP_AUTO_UPDATE_CORE', array( true, 'beta', 'rc', 'minor' ) ), + $this->test_constants( 'WP_AUTO_UPDATE_CORE', array( true, 'beta', 'rc', 'development', 'branch-development', 'minor' ) ), $this->test_wp_version_check_attached(), $this->test_filters_automatic_updater_disabled(), $this->test_wp_automatic_updates_disabled(), diff --git a/src/wp-admin/update-core.php b/src/wp-admin/update-core.php index 2979d69996..35ae406799 100644 --- a/src/wp-admin/update-core.php +++ b/src/wp-admin/update-core.php @@ -306,7 +306,7 @@ function core_auto_updates_settings() { $upgrade_major = get_site_option( 'auto_update_core_major', 'unset' ) === 'enabled'; $can_set_update_option = true; - // WP_AUTO_UPDATE_CORE = true (all), 'beta', 'rc', 'minor', false. + // WP_AUTO_UPDATE_CORE = true (all), 'beta', 'rc', 'development', 'branch-development', 'minor', false. if ( defined( 'WP_AUTO_UPDATE_CORE' ) ) { if ( false === WP_AUTO_UPDATE_CORE ) { // Defaults to turned off, unless a filter allows it. @@ -314,8 +314,7 @@ function core_auto_updates_settings() { $upgrade_minor = false; $upgrade_major = false; } elseif ( true === WP_AUTO_UPDATE_CORE - || 'beta' === WP_AUTO_UPDATE_CORE - || 'rc' === WP_AUTO_UPDATE_CORE + || in_array( WP_AUTO_UPDATE_CORE, array( 'beta', 'rc', 'development', 'branch-development' ), true ) ) { // ALL updates for core. $upgrade_dev = true; diff --git a/src/wp-includes/update.php b/src/wp-includes/update.php index c632b8405a..d4b538e29d 100644 --- a/src/wp-includes/update.php +++ b/src/wp-includes/update.php @@ -136,8 +136,10 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { $post_body = array_merge( $post_body, $extra_stats ); } - // Allow for WP_AUTO_UPDATE_CORE to specify beta/RC releases. - if ( defined( 'WP_AUTO_UPDATE_CORE' ) && in_array( WP_AUTO_UPDATE_CORE, array( 'beta', 'rc' ), true ) ) { + // Allow for WP_AUTO_UPDATE_CORE to specify beta/RC/development releases. + if ( defined( 'WP_AUTO_UPDATE_CORE' ) + && in_array( WP_AUTO_UPDATE_CORE, array( 'beta', 'rc', 'development', 'branch-development' ), true ) + ) { $query['channel'] = WP_AUTO_UPDATE_CORE; }