Index: src/wp-admin/includes/class-core-upgrader.php =================================================================== --- src/wp-admin/includes/class-core-upgrader.php (revision 49563) +++ src/wp-admin/includes/class-core-upgrader.php (working copy) @@ -279,9 +279,9 @@ $current_is_development_version = (bool) strpos( $wp_version, '-' ); // Defaults: - $upgrade_dev = get_site_option( 'auto_update_core_dev', true ); - $upgrade_minor = get_site_option( 'auto_update_core_minor', true ); - $upgrade_major = get_site_option( 'auto_update_core_major', false ); + $upgrade_dev = get_site_option( 'auto_update_core_dev', 'enabled' ) === 'enabled'; + $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. if ( defined( 'WP_AUTO_UPDATE_CORE' ) ) { Index: src/wp-admin/update-core.php =================================================================== --- src/wp-admin/update-core.php (revision 49563) +++ src/wp-admin/update-core.php (working copy) @@ -306,22 +306,22 @@ * @since 5.6.0 */ function core_auto_updates_settings() { - $upgrade_major_value = ''; - if ( isset( $_POST['core-auto-updates-settings'] ) && wp_verify_nonce( $_POST['set_core_auto_updates_settings'], 'core-auto-updates-nonce' ) ) { - if ( isset( $_POST['core-auto-updates-major'] ) && 1 === (int) $_POST['core-auto-updates-major'] ) { - update_site_option( 'auto_update_core_major', 1 ); - } else { - update_site_option( 'auto_update_core_major', 0 ); + if ( isset( $_GET['core-major-auto-updates-saved'] ) ) { + if ( 'enabled' === $_GET['core-major-auto-updates-saved'] ) { + $notice_text = __( 'WordPress will auto-update to next major versions.' ); + echo '

' . $notice_text . '

'; + } elseif ( 'disabled' === $_GET['core-major-auto-updates-saved'] ) { + $notice_text = __( 'WordPress will no longer auto-update to next major versions.' ); + echo '

' . $notice_text . '

'; } - echo '

'; - _e( 'WordPress auto-update settings updated.' ); - echo '

'; } - $upgrade_dev = get_site_option( 'auto_update_core_dev', true ); - $upgrade_minor = get_site_option( 'auto_update_core_minor', true ); - $upgrade_major = get_site_option( 'auto_update_core_major', false ); + // Defaults: + $upgrade_dev = get_site_option( 'auto_update_core_dev', 'enabled' ) === 'enabled'; + $upgrade_minor = get_site_option( 'auto_update_core_minor', 'enabled' ) === 'enabled'; + $upgrade_major = get_site_option( 'auto_update_core_major', 'unset' ) === 'enabled'; + $upgrade_major_optin_enabled = true; // WP_AUTO_UPDATE_CORE = true (all), 'beta', 'rc', 'minor', false. if ( defined( 'WP_AUTO_UPDATE_CORE' ) ) { if ( false === WP_AUTO_UPDATE_CORE ) { @@ -343,8 +343,26 @@ $upgrade_minor = true; $upgrade_major = false; } + + // The UI is overridden by the WP_AUTO_UPDATE_CORE constant. + $upgrade_major_optin_enabled = false; } + if ( defined( 'AUTOMATIC_UPDATER_DISABLED' ) ) { + if ( true === AUTOMATIC_UPDATER_DISABLED ) { + $upgrade_dev = false; + $upgrade_minor = false; + $upgrade_major = false; + } + // The UI is overridden by the AUTOMATIC_UPDATER_DISABLED constant. + $upgrade_major_optin_enabled = false; + } + + // Is the UI overridden by a plugin using the allow_major_auto_core_updates filter? + if ( has_filter( 'allow_major_auto_core_updates' ) ) { + $upgrade_major_optin_enabled = false; + } + /** This filter is documented in wp-admin/includes/class-core-upgrader.php */ $upgrade_dev = apply_filters( 'allow_dev_auto_core_updates', $upgrade_dev ); /** This filter is documented in wp-admin/includes/class-core-upgrader.php */ @@ -357,40 +375,54 @@ 'minor' => $upgrade_minor, 'major' => $upgrade_major, ); + + if ( $upgrade_major ) { + $wp_version = get_bloginfo( 'version' ); + $updates = get_core_updates(); + + if ( isset( $updates[0]->version ) && version_compare( $updates[0]->version, $wp_version, '>' ) ) { + echo '

' . wp_get_auto_update_message() . '

'; + } + } + + $action_url = self_admin_url( 'update-core.php?action=core-major-auto-updates-settings' ); ?> -
- -

+ +

version ) && version_compare( $updates[0]->version, $wp_version, '>' ) ) { - echo wp_get_auto_update_message(); - } + if ( $upgrade_major ) { + echo sprintf( + /* Translators: Action link to disable core auto-updates. */ + __( 'Auto-updates for regular feature updates are on. You can turn them off.' ), + wp_nonce_url( add_query_arg( 'value', 'disable', $action_url ), 'core-major-auto-updates-nonce' ) + ); + } else { + echo sprintf( + /* Translators: Action link to enable core auto-updates. */ + __( 'You are invited to automatically keep this site up-to-date with regular feature updates.' ), + wp_nonce_url( add_query_arg( 'value', 'enable', $action_url ), 'core-major-auto-updates-nonce' ) + ); } ?>

+

- /> - +

- +

- +

-
+ +

+

+

'; @@ -982,8 +1016,8 @@ echo '

'; if ( current_user_can( 'update_core' ) ) { + core_auto_updates_settings(); core_upgrade_preamble(); - core_auto_updates_settings(); } if ( current_user_can( 'update_plugins' ) ) { list_plugin_updates(); @@ -1158,6 +1192,23 @@ require_once ABSPATH . 'wp-admin/admin-footer.php'; +} elseif ( 'core-major-auto-updates-settings' === $action ) { + $redirect_url = self_admin_url( 'update-core.php' ); + + if ( isset( $_GET['value'] ) ) { + check_admin_referer( 'core-major-auto-updates-nonce' ); + + if ( 'enable' === $_GET['value'] ) { + update_site_option( 'auto_update_core_major', 'enabled' ); + $redirect_url = add_query_arg( 'core-major-auto-updates-saved', 'enabled', $redirect_url ); + } elseif ( 'disable' === $_GET['value'] ) { + update_site_option( 'auto_update_core_major', 'disabled' ); + $redirect_url = add_query_arg( 'core-major-auto-updates-saved', 'disabled', $redirect_url ); + } + } + + wp_redirect( $redirect_url ); + exit; } else { /** * Fires for each custom update action on the WordPress Updates screen.