Changeset 41997

Timestamp:

10/24/2017 07:05:48 PM (7 years ago)

Author:

westonruter

Message:

Customize: Prevent theme installation and deletion in Customizer while SFTP credentials need to be requested.

This is a temporary measure while we wait for credentials to be able to be supplied in the Customizer.

Amends [41788].
See #42184, #37661, #42126.

Location:

trunk/src

Files:

• wp-admin/js/customize-controls.js (modified) (6 diffs)
• wp-includes/class-wp-customize-manager.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/wp-admin/js/customize-controls.js

@@ -2987 +2987 @@
          */
         attachEvents: function() {
-            var panel = this, toggleDisabledNotification;
+            var panel = this;
 
             // Attach regular panel events.
             api.Panel.prototype.attachEvents.apply( panel );
 
-            toggleDisabledNotification = function() {
+            // Temporary since supplying SFTP credentials does not work yet. See #42184
+            if ( api.settings.theme._filesystemCredentialsNeeded ) {
+                panel.notifications.add( new api.Notification( 'theme_install_unavailable', {
+                    message: api.l10n.themeInstallUnavailable,
+                    type: 'info',
+                    dismissible: true
+                } ) );
+            }
+
+            function toggleDisabledNotifications() {
                 if ( 'publish' === api.state( 'selectedChangesetStatus' ).get() ) {
                     panel.notifications.remove( 'theme_switch_unavailable' );
@@ -3001 +3010 @@
                     } ) );
                 }
-            };
-            toggleDisabledNotification();
-            api.state( 'selectedChangesetStatus' ).bind( toggleDisabledNotification );
+            }
+            toggleDisabledNotifications();
+            api.state( 'selectedChangesetStatus' ).bind( toggleDisabledNotifications );
 
             // Collapse panel to customize the current theme.
@@ -3096 +3105 @@
             var panel = this, preview, onInstallSuccess, slug = $( event.target ).data( 'slug' ), deferred = $.Deferred(), request;
             preview = $( event.target ).hasClass( 'preview' );
+
+            // Temporary since supplying SFTP credentials does not work yet. See #42184.
+            if ( api.settings.theme._filesystemCredentialsNeeded ) {
+                deferred.reject({
+                    errorCode: 'theme_install_unavailable'
+                });
+                return deferred.promise();
+            }
 
             // Prevent loading a non-active theme preview when there is a drafted/scheduled changeset.
@@ -3296 +3313 @@
 
             event.preventDefault();
+
+            // Temporary since supplying SFTP credentials does not work yet. See #42184.
+            if ( api.settings.theme._filesystemCredentialsNeeded ) {
+                return;
+            }
 
             // Confirmation dialog for deleting a theme.
@@ -4984 +5006 @@
          */
         ready: function() {
-            var control = this, disableSwitchButtons, updateButtons;
-
-            disableSwitchButtons = function() {
+            var control = this;
+
+            function disableSwitchButtons() {
                 return 'publish' !== api.state( 'selectedChangesetStatus' ).get() && control.params.theme.id !== api.settings.theme.stylesheet;
-            };
-            updateButtons = function() {
-                control.container.find( 'button' ).toggleClass( 'disabled', disableSwitchButtons() );
-            };
-
-            api.state( 'selectedChangesetStatus' ).bind( updateButtons );
+            }
+
+            // Temporary special function since supplying SFTP credentials does not work yet. See #42184.
+            function disableInstallButtons() {
+                return disableSwitchButtons() || true === api.settings.theme._filesystemCredentialsNeeded;
+            }
+            function updateButtons( container ) {
+                var _container = container || control.container;
+                _container.find( 'button.preview, button.preview-theme' ).toggleClass( 'disabled', disableSwitchButtons() );
+                _container.find( 'button.theme-install' ).toggleClass( 'disabled', disableInstallButtons() );
+            }
+
+            api.state( 'selectedChangesetStatus' ).bind( function() {
+                updateButtons();
+            });
             updateButtons();
 
@@ -5020 +5051 @@
                 section = api.section( control.section() );
                 section.showDetails( control.params.theme, function() {
-                    section.overlay.find( '.theme-actions button' ).toggleClass( 'disabled', disableSwitchButtons() );
+                    updateButtons( section.overlay.find( '.theme-actions' ) );
+
+                    // Temporary special function since supplying SFTP credentials does not work yet. See #42184.
+                    if ( api.settings.theme._filesystemCredentialsNeeded ) {
+                        section.overlay.find( '.theme-actions .delete-theme' ).remove();
+                    }
                 } );
             });

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -4619 +4619 @@
         );
 
+        // Temporarily disable installation in Customizer. See #42184.
+        $filesystem_method = get_filesystem_method();
+        ob_start();
+        $filesystem_credentials_are_stored = request_filesystem_credentials( self_admin_url() );
+        ob_end_clean();
+        if ( 'direct' !== $filesystem_method && ! $filesystem_credentials_are_stored ) {
+            $settings['theme']['_filesystemCredentialsNeeded'] = true;
+        }
+
         // Prepare Customize Section objects to pass to JavaScript.
         foreach ( $this->sections() as $id => $section ) {

trunk/src/wp-includes/script-loader.php

@@ -594 +594 @@
         'scheduleDescription' => __( 'Schedule your customization changes to publish ("go live") at a future date.' ),
         'themePreviewUnavailable' => __( 'Sorry, you can’t preview new themes when you have changes scheduled or saved as a draft. Please publish your changes, or wait until they publish to preview new themes.' ),
+        'themeInstallUnavailable' => sprintf(
+            /* translators: %s is URL to Add Themes admin screen */
+            __( 'You won&#8217;t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ),
+            esc_url( admin_url( 'theme-install.php' ) )
+        ),
     ) );
     $scripts->add( 'customize-selective-refresh', "/wp-includes/js/customize-selective-refresh$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 );