<!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>[37221] trunk/src/wp-admin: Plugin Install: show the upload form in place rather than sending users to the devoted upload plugin page.</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/37221">37221</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/37221","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>afercia</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-16 16:42:48 +0000 (Sat, 16 Apr 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'>Plugin Install: show the upload form in place rather than sending users to the devoted upload plugin page.
Props Ipstenu, ericlewis, michaelarestad.
Fixes <a href="https://core.trac.wordpress.org/ticket/35429">#35429</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="#trunksrcwpadminincludesclasswpupgraderskinsphp">trunk/src/wp-admin/includes/class-wp-upgrader-skins.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminjsplugininstalljs">trunk/src/wp-admin/js/plugin-install.js</a></li>
<li><a href="#trunksrcwpadminjsthemejs">trunk/src/wp-admin/js/theme.js</a></li>
<li><a href="#trunksrcwpadminplugininstallphp">trunk/src/wp-admin/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>
<li><a href="#trunksrcwpadminthemeinstallphp">trunk/src/wp-admin/theme-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-04-16 14:51:01 UTC (rev 37220)
+++ trunk/src/wp-admin/css/themes.css 2016-04-16 16:42:48 UTC (rev 37221)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1056,13 +1056,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .theme-install-php a.browse-themes {
</span><span class="cx" style="display: block; padding: 0 10px"> cursor: pointer;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.theme-install-php a.browse-themes,
-.theme-install-php.show-upload-theme a.upload {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+.upload-view-toggle .browse,
+.upload-view-toggle.upload-tab .upload {
</ins><span class="cx" style="display: block; padding: 0 10px"> display: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.theme-install-php.show-upload-theme a.browse-themes {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+.upload-view-toggle.upload-tab .browse {
</ins><span class="cx" style="display: block; padding: 0 10px"> display: inline;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> .upload-theme,
</span><span class="cx" style="display: block; padding: 0 10px"> .upload-plugin {
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-box-sizing: border-box;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1076,10 +1079,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><span class="cx" style="display: block; padding: 0 10px"> top: 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">-body.show-upload-theme .upload-theme,
-.upload-plugin {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+.show-upload-view .upload-theme,
+.show-upload-view .upload-plugin,
+.upload-tab .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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> .upload-theme .wp-upload-form,
</span><span class="cx" style="display: block; padding: 0 10px"> .upload-plugin .wp-upload-form {
</span><span class="cx" style="display: block; padding: 0 10px"> background: #fafafa;
</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-04-16 14:51:01 UTC (rev 37220)
+++ trunk/src/wp-admin/includes/admin-filters.php 2016-04-16 16:42:48 UTC (rev 37221)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'install_plugins_upload', 'install_plugins_upload' );
</del><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="trunksrcwpadminincludesclasswpupgraderskinsphp"></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/class-wp-upgrader-skins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-upgrader-skins.php 2016-04-16 14:51:01 UTC (rev 37220)
+++ trunk/src/wp-admin/includes/class-wp-upgrader-skins.php 2016-04-16 16:42:48 UTC (rev 37221)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -579,6 +579,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $install_actions['importers_page'] = '<a href="' . admin_url( 'import.php' ) . '" target="_parent">' . __( 'Return to Importers' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $this->type == 'web' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugin-install.php' ) . '" target="_parent">' . __( 'Return to Plugin Installer' ) . '</a>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'upload' == $this->type && 'plugins' == $from ) {
+ $install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugin-install.php' ) . '">' . __( 'Return to Plugin Installer' ) . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></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/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin-install.php 2016-04-16 14:51:01 UTC (rev 37220)
+++ trunk/src/wp-admin/includes/plugin-install.php 2016-04-16 16:42:48 UTC (rev 37221)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,7 +210,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function install_dashboard() {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format via <a href="%2$s">this page</a>.' ), 'https://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format by clicking the button at the top of this page.' ), 'https://wordpress.org/plugins/' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php display_plugins_table(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</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-04-16 14:51:01 UTC (rev 37220)
+++ trunk/src/wp-admin/js/plugin-install.js 2016-04-16 16:42:48 UTC (rev 37221)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* global plugininstallL10n, tb_click, tb_remove */
</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 Browser Thickbox related JS*/
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Functionality for the plugin install screens.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> var tb_position;
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery( document ).ready( function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,4 +176,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#section-holder div.section' ).hide(); // Hide 'em all.
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#section-' + tab ).show();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /*
+ * When a user presses the "Upload Plugin" button, show the upload form in place
+ * rather than sending them to the devoted upload plugin page.
+ * @todo consider to abstract this in a generic, reusable, utility, see theme.js
+ */
+ var uploadViewToggle = $( '.upload-view-toggle' ),
+ $body = $( document.body );
+
+ uploadViewToggle
+ .attr({
+ role: 'button',
+ 'aria-expanded': 'false'
+ })
+ .on( 'click', function( event ) {
+ event.preventDefault();
+ $body.toggleClass( 'show-upload-view' );
+ uploadViewToggle.attr( 'aria-expanded', $body.hasClass( 'show-upload-view' ) );
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre></div>
<a id="trunksrcwpadminjsthemejs"></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/theme.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/theme.js 2016-04-16 14:51:01 UTC (rev 37220)
+++ trunk/src/wp-admin/js/theme.js 2016-04-16 16:42:48 UTC (rev 37221)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1604,17 +1604,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // in new location
</span><span class="cx" style="display: block; padding: 0 10px"> searchContainer: $( '.wp-filter .search-form' ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * When a user presses the "Upload Theme" button, show the upload form in place.
+ * @todo consider to abstract this in a generic, reusable, utility, see plugin-install.js
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> uploader: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( 'a.upload' ).on( 'click', function( event ) {
- event.preventDefault();
- $( 'body' ).addClass( 'show-upload-theme' );
- themes.router.navigate( themes.router.baseUrl( '?upload' ), { replace: true } );
- });
- $( 'a.browse-themes' ).on( 'click', function( event ) {
- event.preventDefault();
- $( 'body' ).removeClass( 'show-upload-theme' );
- themes.router.navigate( themes.router.baseUrl( '' ), { replace: true } );
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var uploadViewToggle = $( '.upload-view-toggle' ),
+ $body = $( document.body );
+
+ uploadViewToggle
+ .attr({
+ role: 'button',
+ 'aria-expanded': 'false'
+ })
+ .on( 'click', function( event ) {
+ event.preventDefault();
+ $body.toggleClass( 'show-upload-view' );
+ 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"> // Toggle the full filters navigation
</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-04-16 14:51:01 UTC (rev 37220)
+++ trunk/src/wp-admin/plugin-install.php 2016-04-16 16:42:48 UTC (rev 37221)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,17 +106,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $tab === 'upload' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $href = self_admin_url( 'plugin-install.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = _x( 'Browse', 'plugins' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $upload_tab_class = ' upload-tab';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $href = self_admin_url( 'plugin-install.php?tab=upload' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = __( 'Upload Plugin' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $upload_tab_class = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo ' <a href="' . $href . '" class="upload page-title-action">' . $text . '</a>';
</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%s"><span class="upload">%s</span><span class="browse">%s</span></a>',
+ $href,
+ $upload_tab_class,
+ __( 'Upload Plugin' ),
+ __( 'Browse Plugins' )
+ );
</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"> </h1>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="upload-plugin-wrap<?php echo $upload_tab_class; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*
+ * Output the upload plugin form on every plugin install screen, so it can be
+ * displayed via JavaScript rather then opening up the devoted upload plugin page.
+ */
+install_plugins_upload(); ?>
+</div>
+
+<?php
</ins><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>
<a id="trunksrcwpadminpluginsphp"></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/plugins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugins.php 2016-04-16 14:51:01 UTC (rev 37220)
+++ trunk/src/wp-admin/plugins.php 2016-04-16 16:42:48 UTC (rev 37221)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,11 +372,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' =>
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Plugin Browser/Installer URL, 2: WordPress Plugin Directory URL 3: local plugin directory */
- __( 'You can find additional plugins for your site by using the <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="%2$s" target="_blank">WordPress Plugin Directory</a> directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your %3$s directory. Once a plugin has been installed, you can activate it here.' ),
- 'plugin-install.php',
- 'https://wordpress.org/plugins/',
- '<code>/wp-content/plugins</code>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress Plugin Directory URL */
+ __( 'If you would like to see more plugins to choose from, click on the “Add New” button and you will be able to browse or search for additional plugins from the <a href="%s" target="_blank">WordPress.org Plugin Directory</a>. Plugins in the WordPress.org Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ),
+ 'https://wordpress.org/plugins/'
</ins><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab( array(
</span></span></pre></div>
<a id="trunksrcwpadminthemeinstallphp"></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/theme-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-install.php 2016-04-16 14:51:01 UTC (rev 37220)
+++ trunk/src/wp-admin/theme-install.php 2016-04-16 16:42:48 UTC (rev 37221)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,8 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $tabs = apply_filters( 'install_themes_tabs', array( 'upload' => __( 'Upload Theme' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo ' <a href="#" class="upload page-title-action">' . __( 'Upload Theme' ) . '</a>';
- echo ' <a href="#" class="browse-themes page-title-action">' . _x( 'Browse', 'themes' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo ' <a href="#" class="upload-view-toggle page-title-action">' . __( 'Upload Theme' ) . '</a>';
</ins><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></span></pre>
</div>
</div>
</body>
</html>