Changeset 42537

Timestamp:

01/22/2018 06:15:54 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 for 4.9 branch.

Location:

branches/4.9

Files:

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

branches/4.9/src/wp-admin/js/customize-controls.js

@@ -2565 +2565 @@
             // 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;
             }
 
@@ -3075 +3075 @@
 
             // 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,
@@ -5133 +5133 @@
             // 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() {

branches/4.9/src/wp-includes/class-wp-customize-manager.php

@@ -4637 +4637 @@
             ),
             '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(