Ticket #37495: uploader-filter2.diff

wp-admin/plugin-install.php

@@ -130 +130 @@
  * 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(); ?>
+ 
+/**
+ * Fires after the plugins list table in each tab of the Install Plugins screen.
+ *
+ * @since 2.7
+ *
+ */
+do_action('install_plugins_upload'); ?>
 </div>
 
 <?php
@@ -149 +156 @@
  *
  * @param int $paged The current page number of the plugins list table.
  */
-do_action( "install_plugins_$tab", $paged ); ?>
+if ( $tab !== 'upload' ) do_action( "install_plugins_$tab", $paged ); ?>
 
         <span class="spinner"></span>
 </div>

wp-admin/includes/admin-filters.php

@@ -70 +70 @@
 
 // Plugin Install hooks.
 add_action( 'install_plugins_featured',               'install_dashboard' );
+add_action( 'install_plugins_upload',                 'install_plugins_upload' );
 add_action( 'install_plugins_search',                 'display_plugins_table' );
 add_action( 'install_plugins_popular',                'display_plugins_table' );
 add_action( 'install_plugins_recommended',            'display_plugins_table' );