Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade/Install: Account for the `automatic_updater_disabled` filter in core auto-update settings UI. 

Follow-up to [49587].

Props markparnell, audrasjb.
See #51742.
Built from https://develop.svn.wordpress.org/trunk@49592


git-svn-id: http://core.svn.wordpress.org/trunk@49330 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-11-13 11:14:08 +00:00
parent d6a597efe2
commit 0bc22bb1fc
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/update-core.php
View File

@ -348,8 +348,13 @@ function core_auto_updates_settings() {
$can_set_update_option = false;
}
if ( defined( 'AUTOMATIC_UPDATER_DISABLED' ) ) {
if ( true === AUTOMATIC_UPDATER_DISABLED ) {
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;

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.6-beta4-49591';
$wp_version = '5.6-beta4-49592';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.