<!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>[38172] trunk/src/wp-admin: Plugins: Use `install_plugins_upload` action to print the upload form.</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/38172">38172</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/38172","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-07-31 18:10:45 +0000 (Sun, 31 Jul 2016)</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'>Plugins: Use `install_plugins_upload` action to print the upload form.
Since <a href="https://core.trac.wordpress.org/changeset/37221">[37221]</a> the upload form is added to every plugin install screen via `install_plugins_upload()`. Previously the form was added through the `install_plugins_upload` (alias of `install_plugins_$tab`) action which allowed plugin authors to replace the form. This restores the previous behaviour.
* Add the form only to non-upload plugin install screens.
* Replace `install_plugins_upload()` with the `install_plugins_upload` and `install_plugins_pre_upload` actions.
* Remove `$upload_tab_class` and add a CSS class for the current tab to `.wrap`
* Adjust CSS selectors and toggle the whole container to support upload without an `upload-plugin` class.
Props DavidAnderson, ocean90.
Fixes <a href="https://core.trac.wordpress.org/ticket/37495">#37495</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssthemescss">trunk/src/wp-admin/css/themes.css</a></li>
<li><a href="#trunksrcwpadminincludesadminfiltersphp">trunk/src/wp-admin/includes/admin-filters.php</a></li>
<li><a href="#trunksrcwpadminjsplugininstalljs">trunk/src/wp-admin/js/plugin-install.js</a></li>
<li><a href="#trunksrcwpadminplugininstallphp">trunk/src/wp-admin/plugin-install.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssthemescss"></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/css/themes.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/themes.css 2016-07-31 16:36:45 UTC (rev 38171)
+++ trunk/src/wp-admin/css/themes.css 2016-07-31 18:10:45 UTC (rev 38172)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1026,11 +1026,11 @@
</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"> .upload-view-toggle .browse,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.upload-view-toggle.upload-tab .upload {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.plugin-install-tab-upload .upload-view-toggle .upload {
</ins><span class="cx" style="display: block; padding: 0 10px"> display: none;
</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">-.upload-view-toggle.upload-tab .browse {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.plugin-install-tab-upload .upload-view-toggle .browse {
</ins><span class="cx" style="display: block; padding: 0 10px"> display: inline;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1048,9 +1048,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> top: 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">+.upload-plugin-wrap {
+ display: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .show-upload-view .upload-theme,
</span><span class="cx" style="display: block; padding: 0 10px"> .show-upload-view .upload-plugin,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.upload-tab .upload-plugin {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.show-upload-view .upload-plugin-wrap,
+.plugin-install-tab-upload .upload-plugin {
</ins><span class="cx" style="display: block; padding: 0 10px"> display: block;
</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="trunksrcwpadminincludesadminfiltersphp"></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/admin-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/admin-filters.php 2016-07-31 16:36:45 UTC (rev 38171)
+++ trunk/src/wp-admin/includes/admin-filters.php 2016-07-31 18:10:45 UTC (rev 38172)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,6 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Plugin Install hooks.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'install_plugins_featured', 'install_dashboard' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'install_plugins_upload', 'install_plugins_upload' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'install_plugins_search', 'display_plugins_table' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'install_plugins_popular', 'display_plugins_table' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'install_plugins_recommended', 'display_plugins_table' );
</span></span></pre></div>
<a id="trunksrcwpadminjsplugininstalljs"></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/plugin-install.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/plugin-install.js 2016-07-31 16:36:45 UTC (rev 38171)
+++ trunk/src/wp-admin/js/plugin-install.js 2016-07-31 18:10:45 UTC (rev 38172)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tabbables,
</span><span class="cx" style="display: block; padding: 0 10px"> $firstTabbable,
</span><span class="cx" style="display: block; padding: 0 10px"> $lastTabbable,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uploadViewToggle = $( '.upload-view-toggle' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploadViewToggle = $( '.upload-view-toggle' ),
+ $wrap = $ ( '.wrap' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $body = $( document.body );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> tb_position = function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,12 +184,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * When a user presses the "Upload Plugin" button, show the upload form in place
</span><span class="cx" style="display: block; padding: 0 10px"> * rather than sending them to the devoted upload plugin page.
</span><span class="cx" style="display: block; padding: 0 10px"> * The `?tab=upload` page still exists for no-js support and for plugins that
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * might access it directly (?). When we're in this page, let the link behave
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * might access it directly. When we're in this page, let the link behave
</ins><span class="cx" style="display: block; padding: 0 10px"> * like a link. Otherwise we're in the normal plugin installer pages and the
</span><span class="cx" style="display: block; padding: 0 10px"> * link should behave like a toggle button.
</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 ( ! uploadViewToggle.hasClass( 'upload-tab' ) ) {
- uploadViewToggle
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $wrap.hasClass( 'plugin-install-tab-upload' ) ) {
+ $uploadViewToggle
</ins><span class="cx" style="display: block; padding: 0 10px"> .attr({
</span><span class="cx" style="display: block; padding: 0 10px"> role: 'button',
</span><span class="cx" style="display: block; padding: 0 10px"> 'aria-expanded': 'false'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,7 +197,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .on( 'click', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px"> $body.toggleClass( 'show-upload-view' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uploadViewToggle.attr( 'aria-expanded', $body.hasClass( 'show-upload-view' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploadViewToggle.attr( 'aria-expanded', $body.hasClass( 'show-upload-view' ) );
</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="trunksrcwpadminplugininstallphp"></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/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugin-install.php 2016-07-31 16:36:45 UTC (rev 38171)
+++ trunk/src/wp-admin/plugin-install.php 2016-07-31 18:10:45 UTC (rev 38172)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,6 +66,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "install_plugins_pre_$tab" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*
+ * Call the pre upload action on every non-upload plugin install screen
+ * because the form is always displayed on these screens.
+ */
+if ( 'upload' !== $tab ) {
+ /** This action is documented in wp-admin/plugin-install.php */
+ do_action( 'install_plugins_pre_upload' );
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'overview',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __('Overview'),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,22 +110,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> include(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div class="wrap">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="wrap <?php echo esc_attr( "plugin-install-tab-$tab" ); ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo esc_html( $title );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $tab === 'upload' ) {
- $href = self_admin_url( 'plugin-install.php' );
- $upload_tab_class = ' upload-tab';
- } else {
- $href = self_admin_url( 'plugin-install.php?tab=upload' );
- $upload_tab_class = '';
- }
-
- printf( ' <a href="%s" class="upload-view-toggle page-title-action%s"><span class="upload">%s</span><span class="browse">%s</span></a>',
- $href,
- $upload_tab_class,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( ' <a href="%s" class="upload-view-toggle page-title-action"><span class="upload">%s</span><span class="browse">%s</span></a>',
+ ( 'upload' === $tab ) ? self_admin_url( 'plugin-install.php' ) : self_admin_url( 'plugin-install.php?tab=upload' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Upload Plugin' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Browse Plugins' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,16 +124,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </h1>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div class="upload-plugin-wrap<?php echo $upload_tab_class; ?>">
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Output the upload plugin form on every plugin install screen, so it can be
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Output the upload plugin form on every non-upload plugin install screen, so it can be
</ins><span class="cx" style="display: block; padding: 0 10px"> * displayed via JavaScript rather then opening up the devoted upload plugin page.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-install_plugins_upload(); ?>
-</div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( $tab !== 'upload' ) {
+ ?>
+ <div class="upload-plugin-wrap">
+ <?php
+ /** This action is documented in wp-admin/plugin-install.php */
+ do_action( 'install_plugins_upload' );
+ ?>
+ </div>
+ <?php
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $tab !== 'upload' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table->views();
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<br class="clear" />';
</span></span></pre>
</div>
</div>
</body>
</html>