<!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>[41997] trunk/src: Customize: Prevent theme installation and deletion in Customizer while SFTP credentials need to be requested.</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/41997">41997</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/41997","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>2017-10-24 19:05:48 +0000 (Tue, 24 Oct 2017)</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 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 <a href="https://core.trac.wordpress.org/changeset/41788">[41788]</a>.
See <a href="https://core.trac.wordpress.org/ticket/42184">#42184</a>, <a href="https://core.trac.wordpress.org/ticket/37661">#37661</a>, <a href="https://core.trac.wordpress.org/ticket/42126">#42126</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>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.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 2017-10-24 18:46:26 UTC (rev 41996)
+++ trunk/src/wp-admin/js/customize-controls.js 2017-10-24 19:05:48 UTC (rev 41997)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2986,12 +2986,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @returns {void}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> attachEvents: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var panel = this, toggleDisabledNotification;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var panel = this;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Attach regular panel events.
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- toggleDisabledNotification = function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'publish' === api.state( 'selectedChangesetStatus' ).get() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> panel.notifications.remove( 'theme_switch_unavailable' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3000,9 +3009,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'warning'
</span><span class="cx" style="display: block; padding: 0 10px"> } ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- };
- toggleDisabledNotification();
- api.state( 'selectedChangesetStatus' ).bind( toggleDisabledNotification );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ toggleDisabledNotifications();
+ api.state( 'selectedChangesetStatus' ).bind( toggleDisabledNotifications );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Collapse panel to customize the current theme.
</span><span class="cx" style="display: block; padding: 0 10px"> panel.contentContainer.on( 'click', '.customize-theme', function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3096,6 +3105,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var panel = this, preview, onInstallSuccess, slug = $( event.target ).data( 'slug' ), deferred = $.Deferred(), request;
</span><span class="cx" style="display: block; padding: 0 10px"> preview = $( event.target ).hasClass( 'preview' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Prevent loading a non-active theme preview when there is a drafted/scheduled changeset.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'publish' !== api.state( 'selectedChangesetStatus' ).get() && slug !== api.settings.theme.stylesheet ) {
</span><span class="cx" style="display: block; padding: 0 10px"> deferred.reject({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3296,6 +3313,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Temporary since supplying SFTP credentials does not work yet. See #42184.
+ if ( api.settings.theme._filesystemCredentialsNeeded ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Confirmation dialog for deleting a theme.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! window.confirm( api.settings.l10n.confirmDeleteTheme ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4983,16 +5005,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> ready: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var control = this, disableSwitchButtons, updateButtons;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var control = this;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- disableSwitchButtons = function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function disableSwitchButtons() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'publish' !== api.state( 'selectedChangesetStatus' ).get() && control.params.theme.id !== api.settings.theme.stylesheet;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- };
- updateButtons = function() {
- control.container.find( 'button' ).toggleClass( 'disabled', disableSwitchButtons() );
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- api.state( 'selectedChangesetStatus' ).bind( updateButtons );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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();
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> updateButtons();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> control.container.on( 'touchmove', '.theme', function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5019,7 +5050,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault(); // Keep this AFTER the key filter above
</span><span class="cx" style="display: block; padding: 0 10px"> section = api.section( control.section() );
</span><span class="cx" style="display: block; padding: 0 10px"> section.showDetails( control.params.theme, function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- section.overlay.find( '.theme-actions button' ).toggleClass( 'disabled', disableSwitchButtons() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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();
+ }
</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">
</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 2017-10-24 18:46:26 UTC (rev 41996)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2017-10-24 19:05:48 UTC (rev 41997)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4618,6 +4618,15 @@
</span><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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Prepare Customize Section objects to pass to JavaScript.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->sections() as $id => $section ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $section->check_capabilities() ) {
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></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/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2017-10-24 18:46:26 UTC (rev 41996)
+++ trunk/src/wp-includes/script-loader.php 2017-10-24 19:05:48 UTC (rev 41997)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,6 +593,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'scheduleDescription' => __( 'Schedule your customization changes to publish ("go live") at a future date.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '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.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'themeInstallUnavailable' => sprintf(
+ /* translators: %s is URL to Add Themes admin screen */
+ __( 'You won’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' ) )
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'customize-selective-refresh', "/wp-includes/js/customize-selective-refresh$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>