Changeset 42536 for trunk

Timestamp:

01/22/2018 06:14:10 AM (7 years ago)

Author:

westonruter

Message:

Customize: Prevent showing SFTP theme installation notification in multisite when user cannot install themes.

Props flixos90.
See #37661, #42184.
Fixes #42674.

Location:

trunk/src

Files:

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

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

@@ -2568 +2568 @@
             // Temporary special function since supplying SFTP credentials does not work yet. See #42184.
             function disableInstallButtons() {
-                return disableSwitchButtons() || true === api.settings.theme._filesystemCredentialsNeeded;
+                return disableSwitchButtons() || false === api.settings.theme._canInstall || true === api.settings.theme._filesystemCredentialsNeeded;
             }
 
@@ -3065 +3065 @@
 
             // Temporary since supplying SFTP credentials does not work yet. See #42184
-            if ( api.settings.theme._filesystemCredentialsNeeded ) {
+            if ( api.settings.theme._canInstall && api.settings.theme._filesystemCredentialsNeeded ) {
                 panel.notifications.add( new api.Notification( 'theme_install_unavailable', {
                     message: api.l10n.themeInstallUnavailable,
@@ -5093 +5093 @@
             // Temporary special function since supplying SFTP credentials does not work yet. See #42184.
             function disableInstallButtons() {
-                return disableSwitchButtons() || true === api.settings.theme._filesystemCredentialsNeeded;
+                return disableSwitchButtons() || false === api.settings.theme._canInstall || true === api.settings.theme._filesystemCredentialsNeeded;
             }
             function updateButtons() {

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

@@ -4703 +4703 @@
             ),
             'theme'                  => array(
-                'stylesheet' => $this->get_stylesheet(),
-                'active'     => $this->is_theme_active(),
+                'stylesheet'  => $this->get_stylesheet(),
+                'active'      => $this->is_theme_active(),
+                '_canInstall' => current_user_can( 'install_themes' ),
             ),
             'url'                    => array(