<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[42536] trunk/src: Customize: Prevent showing SFTP theme installation notification in multisite when user cannot install themes.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/42536">42536</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/42536","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-01-22 06:14:10 +0000 (Mon, 22 Jan 2018)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customize: Prevent showing SFTP theme installation notification in multisite when user cannot install themes.

Props flixos90.
See <a href="https://core.trac.wordpress.org/ticket/37661">#37661</a>, <a href="https://core.trac.wordpress.org/ticket/42184">#42184</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/42674">#42674</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js       2018-01-22 05:22:14 UTC (rev 42535)
+++ trunk/src/wp-admin/js/customize-controls.js 2018-01-22 06:14:10 UTC (rev 42536)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2567,7 +2567,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Temporary special function since supplying SFTP credentials does not work yet. See #42184.
</span><span class="cx" style="display: block; padding: 0 10px">                        function disableInstallButtons() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return disableSwitchButtons() || true === api.settings.theme._filesystemCredentialsNeeded;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return disableSwitchButtons() || false === api.settings.theme._canInstall || true === api.settings.theme._filesystemCredentialsNeeded;
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        section.overlay.find( 'button.preview, button.preview-theme' ).toggleClass( 'disabled', disableSwitchButtons() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3064,7 +3064,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        api.Panel.prototype.attachEvents.apply( panel );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Temporary since supplying SFTP credentials does not work yet. See #42184
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( api.settings.theme._filesystemCredentialsNeeded ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( api.settings.theme._canInstall && api.settings.theme._filesystemCredentialsNeeded ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 panel.notifications.add( new api.Notification( 'theme_install_unavailable', {
</span><span class="cx" style="display: block; padding: 0 10px">                                        message: api.l10n.themeInstallUnavailable,
</span><span class="cx" style="display: block; padding: 0 10px">                                        type: 'info',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5092,7 +5092,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Temporary special function since supplying SFTP credentials does not work yet. See #42184.
</span><span class="cx" style="display: block; padding: 0 10px">                        function disableInstallButtons() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return disableSwitchButtons() || true === api.settings.theme._filesystemCredentialsNeeded;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return disableSwitchButtons() || false === api.settings.theme._canInstall || true === api.settings.theme._filesystemCredentialsNeeded;
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px">                        function updateButtons() {
</span><span class="cx" style="display: block; padding: 0 10px">                                control.container.find( 'button.preview, button.preview-theme' ).toggleClass( 'disabled', disableSwitchButtons() );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php      2018-01-22 05:22:14 UTC (rev 42535)
+++ trunk/src/wp-includes/class-wp-customize-manager.php        2018-01-22 06:14:10 UTC (rev 42536)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4702,8 +4702,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                'previewFrameSensitivity' => 2000,
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'theme'                  => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'stylesheet' => $this->get_stylesheet(),
-                               'active'     => $this->is_theme_active(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'stylesheet'  => $this->get_stylesheet(),
+                               'active'      => $this->is_theme_active(),
+                               '_canInstall' => current_user_can( 'install_themes' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'url'                    => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                'preview'       => esc_url_raw( $this->get_preview_url() ),
</span></span></pre>
</div>
</div>

</body>
</html>