Ticket #51742: 51742.3.diff

src/wp-admin/update-core.php

@@ -306 +306 @@
  * @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'] ) {
+        if ( isset( $_GET['core-auto-updates-major'] ) ) {
+                if ( 1 === (int) $_GET['core-auto-updates-major'] ) {
                         update_site_option( 'auto_update_core_major', 1 );
                 } else {
                         update_site_option( 'auto_update_core_major', 0 );
@@ -322 +321 @@
         $upgrade_minor = get_site_option( 'auto_update_core_minor', true );
         $upgrade_major = get_site_option( 'auto_update_core_major', false );
 
+        $major_optin_disabled = false;
         // WP_AUTO_UPDATE_CORE = true (all), 'beta', 'rc', 'minor', false.
         if ( defined( 'WP_AUTO_UPDATE_CORE' ) ) {
                 if ( false === WP_AUTO_UPDATE_CORE ) {
@@ -343 +343 @@
                         $upgrade_minor = true;
                         $upgrade_major = false;
                 }
+                $major_optin_disabled = true;
         }
 
         /** This filter is documented in wp-admin/includes/class-core-upgrader.php */
@@ -352 +353 @@
         /** This filter is documented in wp-admin/includes/class-core-upgrader.php */
         $upgrade_major = apply_filters( 'allow_major_auto_core_updates', $upgrade_major );
 
+        $is_major_optin_disabled = apply_filters( 'allow_major_auto_core_updates', null );
+        if ( isset( $is_major_optin_disabled ) ) {
+                $major_optin_disabled = true;
+        }
+
         $auto_update_settings = array(
                 'dev'   => $upgrade_dev,
                 'minor' => $upgrade_minor,
                 'major' => $upgrade_major,
         );
+
+        if ( $auto_update_settings['major'] ) {
+                $wp_version = get_bloginfo( 'version' );
+                $updates    = get_core_updates();
+                if ( isset( $updates[0]->version ) && version_compare( $updates[0]->version, $wp_version, '>' ) ) {
+                        echo '<p>' . wp_get_auto_update_message() . '</p>';
+                }
+        }
         ?>
-        <form method="post" action="<?php echo esc_url( $_SERVER['REQUEST_URI'] ); ?>" name="core-auto-updates" class="form-core-auto-updates">
-                <?php wp_nonce_field( 'core-auto-updates-nonce', 'set_core_auto_updates_settings' ); ?>
-                <h2><?php _e( 'Auto-update settings' ); ?></h2>
+
+        <?php if ( 0 === (int) $major_optin_disabled ) : ?>
                 <p>
                         <?php
-                        if ( $auto_update_settings['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();
-                                }
+                        if ( 0 === (int) $upgrade_major ) {
+                                echo sprintf(
+                                        /* Translators: Action link to enable core auto-updates. */
+                                        __( 'You are invited to <a href="%s">automatically keep this site up-to-date with regular feature updates.</a>' ),
+                                        esc_url( strtok( $_SERVER['REQUEST_URI'], '?' ) ) . '?core-auto-updates-major=1'
+                                );
+                        } else {
+                                echo sprintf(
+                                        /* Translators: Action link to disable core auto-updates. */
+                                        __( 'Auto-updates for regular feature updates are on. You can <a href="%s">turn them off.</a>' ),
+                                        esc_url( strtok( $_SERVER['REQUEST_URI'], '?' ) ) . '?core-auto-updates-major=0'
+                                );
                         }
                         ?>
                 </p>
+        <?php else: ?>
                 <p>
-                        <input type="checkbox" name="core-auto-updates-major" id="core-auto-updates-major" value="1" <?php checked( $auto_update_settings['major'], 1 ); ?> />
-                        <label for="core-auto-updates-major">
-                                <?php _e( 'Automatically keep this site up-to-date with regular feature updates.' ); ?>
-                        </label>
-                </p>
-                <?php
-                /**
-                 * Fires after the major core auto-update checkbox.
-                 *
-                 * @since 5.6.0
-                 */
-                do_action( 'after_core_auto_updates_settings_fields', $auto_update_settings );
-                ?>
-                <p>
-                        <input id="core-auto-updates-settings" class="button" type="submit" value="<?php esc_attr_e( 'Save' ); ?>" name="core-auto-updates-settings" />
+                        <?php _e( 'This website is set to keep itself up-to-date with regular feature updates.' ); ?>
                 </p>
-        </form>
+        <?php endif; ?>
+
         <?php
+        /**
+         * Fires after the major core auto-update option.
+         *
+         * @since 5.6.0
+         */
+        do_action( 'after_core_auto_updates_settings_fields', $auto_update_settings );
 }
 
 /**
@@ -957 +970 @@
         ?>
         <div class="wrap">
         <h1><?php _e( 'WordPress Updates' ); ?></h1>
+        <p><?php _e( 'Here you can find information about updates, set auto-updates and see what plugins or themes need updating.' ); ?></p>
+
         <?php
         if ( $upgrade_error ) {
                 echo '<div class="error"><p>';
@@ -982 +997 @@
         echo '</p>';
 
         if ( current_user_can( 'update_core' ) ) {
-                core_upgrade_preamble();
                 core_auto_updates_settings();
+                core_upgrade_preamble();
         }
         if ( current_user_can( 'update_plugins' ) ) {
                 list_plugin_updates();