Changeset 48688

Timestamp:

07/29/2020 07:59:30 PM (6 years ago)

Author:

whyisjake

Message:

Upgrade/Install: Only show auto-update for themes that support the feature.

Similar to the changes for plugins in [48669], let's only show the UI for themes when updates are supported for that theme.

See #50280.
Props dd32.

Location:

trunk/src

Files:

• js/_enqueues/wp/theme.js (modified) (1 diff)
• wp-admin/includes/theme.php (modified) (3 diffs)
• wp-admin/themes.php (modified) (1 diff)
• wp-includes/update.php (modified) (1 diff)

trunk/src/js/_enqueues/wp/theme.js

@@ -803 +803 @@
                 // Support concurrent clicks in different Theme Details overlays.
                 callback = function( event, data ) {
+                        var autoupdate;
                         if ( _this.model.get( 'id' ) === data.asset ) {
-                                _this.model.set( { autoupdate: 'enable' === data.state } );
+                                autoupdate = _this.model.get( 'autoupdate' );
+                                autoupdate.enabled = 'enable' === data.state;
+                                _this.model.set( { autoupdate: autoupdate } );
                                 $( document ).off( 'wp-auto-update-setting-changed', callback );
                         }

trunk/src/wp-admin/includes/theme.php

@@ -648 +648 @@
         }
 
-        $updates = array();
+        $updates    = array();
+        $no_updates = array();
         if ( current_user_can( 'update_themes' ) ) {
                 $updates_transient = get_site_transient( 'update_themes' );
                 if ( isset( $updates_transient->response ) ) {
                         $updates = $updates_transient->response;
+                }
+                if ( isset( $updates_transient->no_update ) ) {
+                        $no_updates = $updates_transient->no_update;
                 }
         }
@@ -690 +694 @@
                 $auto_update        = in_array( $slug, $auto_updates, true );
                 $auto_update_action = $auto_update ? 'disable-auto-update' : 'enable-auto-update';
+
+                if ( isset( $updates[ $slug ] ) ) {
+                        $auto_update_supported      = true;
+                        $auto_update_filter_payload = (object) $updates[ $slug ];
+                } elseif ( isset( $no_updates[ $slug ] ) ) {
+                        $auto_update_supported      = true;
+                        $auto_update_filter_payload = (object) $no_updates[ $slug ];
+                } else {
+                        $auto_update_supported = false;
+                        /*
+                         * Create the expected payload for the auto_update_theme filter, this is the same data
+                         * as contained within $updates or $no_updates but used when the Theme is not known.
+                         */
+                        $auto_update_filter_payload = (object) array(
+                                'theme'        => $slug,
+                                'new_version'  => $theme->get( 'Version' ),
+                                'url'          => '',
+                                'package'      => '',
+                                'requires'     => $theme->get( 'RequiresWP' ),
+                                'requires_php' => $theme->get( 'RequiresPHP' ),
+                        );
+                }
+
+                /** This action is documented in wp-admin/includes/class-wp-automatic-updater.php */
+                $auto_update_forced = apply_filters( 'auto_update_theme', null, $auto_update_filter_payload );
 
                 $prepared_themes[ $slug ] = array(
@@ -711 +740 @@
                         'hasPackage'     => isset( $updates[ $slug ] ) && ! empty( $updates[ $slug ]['package'] ),
                         'update'         => get_theme_update_available( $theme ),
-                        'autoupdate'     => $auto_update,
+                        'autoupdate'     => array(
+                                'enabled'   => $auto_update || $auto_update_forced,
+                                'supported' => $auto_update_supported,
+                                'forced'    => $auto_update_forced,
+                        ),
                         'actions'        => array(
                                 'activate'   => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,

trunk/src/wp-admin/themes.php

@@ -676 +676 @@
         $template = '
                 <div class="theme-autoupdate">
-                        <# if ( data.autoupdate ) { #>
-                                <button type="button" class="toggle-auto-update button-link" data-slug="{{ data.id }}" data-wp-action="disable">
-                                        <span class="dashicons dashicons-update spin hidden" aria-hidden="true"></span><span class="label">' . __( 'Disable auto-updates' ) . '</span>
-                                </button>
-                        <# } else { #>
-                                <button type="button" class="toggle-auto-update button-link" data-slug="{{ data.id }}" data-wp-action="enable">
-                                        <span class="dashicons dashicons-update spin hidden" aria-hidden="true"></span><span class="label">' . __( 'Enable auto-updates' ) . '</span>
-                                </button>
+                        <# if ( data.autoupdate.supported ) { #>
+                                <# if ( data.autoupdate.forced === false ) { #>
+                                        ' . __( 'Auto-updates disabled' ) . '
+                                <# } else if ( data.autoupdate.forced ) { #>
+                                        ' . __( 'Auto-updates enabled' ) . '
+                                <# } else if ( data.autoupdate.enabled ) { #>
+                                        <button type="button" class="toggle-auto-update button-link" data-slug="{{ data.id }}" data-wp-action="disable">
+                                                <span class="dashicons dashicons-update spin hidden" aria-hidden="true"></span><span class="label">' . __( 'Disable auto-updates' ) . '</span>
+                                        </button>
+                                <# } else { #>
+                                        <button type="button" class="toggle-auto-update button-link" data-slug="{{ data.id }}" data-wp-action="enable">
+                                                <span class="dashicons dashicons-update spin hidden" aria-hidden="true"></span><span class="label">' . __( 'Enable auto-updates' ) . '</span>
+                                        </button>
+                                <# } #>
                         <# } #>
                         <# if ( data.hasUpdate ) { #>
-                                <# if ( data.autoupdate ) { #>
+                                <# if ( data.autoupdate.supported && data.autoupdate.enabled ) { #>
                                         <span class="auto-update-time">
                                 <# } else { #>

trunk/src/wp-includes/update.php

@@ -622 +622 @@
         if ( is_array( $response ) ) {
                 $new_update->response     = $response['themes'];
+                $new_update->no_update    = $response['no_update'];
                 $new_update->translations = $response['translations'];
         }