<!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>[31897] trunk/src/wp-admin: Remove Shiny Plugin Installs</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/31897">31897</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/31897","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jorbin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-26 02:29:52 +0000 (Thu, 26 Mar 2015)</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'>Remove Shiny Plugin Installs
See <a href="https://core.trac.wordpress.org/ticket/31773">#31773</a>, <a href="https://core.trac.wordpress.org/ticket/29820">#29820</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminjsupdatesjs">trunk/src/wp-admin/js/updates.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></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/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2015-03-26 01:44:03 UTC (rev 31896)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2015-03-26 02:29:52 UTC (rev 31897)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2876,58 +2876,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_success( array( 'message' => $message ) );
</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">-/**
- * AJAX handler for installing a plugin.
- *
- * @since 4.2.0
- */
-function wp_ajax_install_plugin() {
- $status = array(
- 'install' => 'plugin',
- 'slug' => sanitize_key( $_POST['slug'] ),
- );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! current_user_can( 'install_plugins' ) ) {
- $status['error'] = __( 'You do not have sufficient permissions to install plugins on this site.' );
- wp_send_json_error( $status );
- }
-
- check_ajax_referer( 'updates' );
-
- include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
- include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
-
- $api = plugins_api( 'plugin_information', array(
- 'slug' => sanitize_key( $_POST['slug'] ),
- 'fields' => array( 'sections' => false )
- ) );
-
- if ( is_wp_error( $api ) ) {
- $status['error'] = $api->get_error_message();
- wp_send_json_error( $status );
- }
-
- $upgrader = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
- $result = $upgrader->install( $api->download_link );
-
- if ( is_wp_error( $result ) ) {
- $status['error'] = $result->get_error_message();
- wp_send_json_error( $status );
- } else if ( is_null( $result ) ) {
- $status['errorCode'] = 'unable_to_connect_to_filesystem';
- $status['error'] = __( 'Unable to connect to the filesystem. Please confirm your credentials.' );
- wp_send_json_error( $status );
- }
-
- $plugin_status = install_plugin_install_status( $api );
-
- if ( ! is_multisite() ) {
- activate_plugin( $plugin_status['file'] );
- }
-
- wp_send_json_success( $status );
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * AJAX handler for updating a plugin.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpadminjsupdatesjs"></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/updates.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/updates.js 2015-03-26 01:44:03 UTC (rev 31896)
+++ trunk/src/wp-admin/js/updates.js 2015-03-26 02:29:52 UTC (rev 31897)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Flag if we're waiting for an install/update to complete.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Flag if we're waiting for an update to complete.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.updateLock = false;
</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">- * * Flag if we've done an install or update successfully.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * * Flag if we've done an update successfully.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.updateDoneSuccessfully = false;
</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">- * If the user tries to install/update a plugin while an install/update is
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If the user tries to update a plugin while an update is
</ins><span class="cx" style="display: block; padding: 0 10px"> * already happening, it can be placed in this queue to perform later.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,92 +256,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Send an Ajax request to the server to install a plugin.
- *
- * @since 4.2.0
- *
- * @param {string} slug
- */
- wp.updates.installPlugin = function( slug ) {
- var $message = $( '.plugin-card-' + slug ).find( '.install-now' );
-
- $message.addClass( 'updating-message' );
- $message.text( wp.updates.l10n.installing );
- wp.a11y.speak( wp.updates.l10n.installingMsg );
-
- if ( wp.updates.updateLock ) {
- wp.updates.updateQueue.push( {
- type: 'install-plugin',
- data: {
- slug: slug
- }
- } );
- return;
- }
-
- wp.updates.updateLock = true;
-
- var data = {
- _ajax_nonce: wp.updates.ajaxNonce,
- slug: slug,
- username: wp.updates.filesystemCredentials.ftp.username,
- password: wp.updates.filesystemCredentials.ftp.password,
- hostname: wp.updates.filesystemCredentials.ftp.hostname,
- connection_type: wp.updates.filesystemCredentials.ftp.connectionType,
- public_key: wp.updates.filesystemCredentials.ssh.publicKey,
- private_key: wp.updates.filesystemCredentials.ssh.privateKey
- };
-
- wp.ajax.post( 'install-plugin', data )
- .done( wp.updates.installSuccess )
- .fail( wp.updates.installError );
- };
-
- /**
- * On plugin install success, update the UI with the result.
- *
- * @since 4.2.0
- *
- * @param {object} response
- */
- wp.updates.installSuccess = function( response ) {
- var $message = $( '.plugin-card-' + response.slug ).find( '.install-now' );
-
- $message.removeClass( 'updating-message' ).addClass( 'updated-message button-disabled' );
- $message.text( wp.updates.l10n.installed );
- wp.a11y.speak( wp.updates.l10n.installedMsg );
- wp.updates.updateDoneSuccessfully = true;
-
- /*
- * The lock can be released since the update was successful,
- * and any other updates can commence.
- */
- wp.updates.updateLock = false;
- wp.updates.queueChecker();
- };
-
- /**
- * On plugin install failure, update the UI appropriately.
- *
- * @since 4.2.0
- *
- * @param {object} response
- */
- wp.updates.installError = function( response ) {
- var $message = $( '.plugin-card-' + response.slug ).find( '.install-now' );
- wp.updates.updateDoneSuccessfully = false;
- if ( response.errorCode && response.errorCode == 'unable_to_connect_to_filesystem' ) {
- wp.updates.credentialError( response, 'install-plugin' );
- return;
- }
-
- $message.removeClass( 'updating-message' );
- $message.text( wp.updates.l10n.installNow );
-
- wp.updates.updateLock = false;
- };
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Events that need to happen when there is a credential error
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -361,7 +275,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If an install/update job has been placed in the queue, queueChecker pulls it out and runs it.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If an update job has been placed in the queue, queueChecker pulls it out and runs it.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,13 +286,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var job = wp.updates.updateQueue.shift();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* This normally wouldn't be a switch, but is there since updates and installs
+ originally were developed together. Kept as a switch to help with bringing
+ installs back in and to preserve commit history. */
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( job.type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'update-plugin':
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.updatePlugin( job.data.plugin, job.data.slug );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'install-plugin':
- wp.updates.installPlugin( job.data.slug );
- break;
</del><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> window.console.log( 'Failed to exect queued update job.' );
</span><span class="cx" style="display: block; padding: 0 10px"> window.console.log( job );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -463,17 +377,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.updatePlugin( $button.data( 'plugin' ), $button.data( 'slug' ) );
</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">- $( '.plugin-card .install-now' ).on( 'click', function( e ) {
- e.preventDefault();
- if ( wp.updates.shouldRequestFilesystemCredentials && ! wp.updates.updateLock ) {
- wp.updates.requestFilesystemCredentials();
- }
- var $button = $( e.target );
- if ( $button.hasClass( 'button-disabled' ) ) {
- return;
- }
- wp.updates.installPlugin( $button.data( 'slug' ) );
- } );
</del><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"> $( window ).on( 'message', function( e ) {
</span></span></pre>
</div>
</div>
</body>
</html>