Ticket #37373: 37373.diff

src/wp-admin/includes/ajax-actions.php

@@ -3822 +3822 @@
  * Ajax handler for searching plugins to install.
  *
  * @since 4.6.0
- *
- * @global WP_List_Table $wp_list_table Current list table instance.
- * @global string        $hook_suffix   Current admin page.
  */
 function wp_ajax_search_install_plugins() {
         check_ajax_referer( 'updates' );
 
-        global $wp_list_table, $hook_suffix;
-        $hook_suffix = 'plugin-install.php';
+        $pagenow = sanitize_text_field( wp_unslash( $_POST['pagenow'] ) );
+
+        if ( $pagenow === 'plugin-install-network' || $pagenow === 'plugin-install' ) {
+                set_current_screen( $pagenow );
+        }
 
         /** @var WP_Plugin_Install_List_Table $wp_list_table */
         $wp_list_table = _get_list_table( 'WP_Plugin_Install_List_Table' );

src/wp-admin/js/updates.js

@@ -1987 +1987 @@
                                         _ajax_nonce: wp.updates.ajaxNonce,
                                         s:           $( '<p />' ).html( $( this ).val() ).text(),
                                         tab:         'search',
-                                        type:        $( '#typeselector' ).val()
+                                        type:        $( '#typeselector' ).val(),
+                                        pagenow:     pagenow
                                 }, { type: 'term' } );
 
                         if ( wp.updates.searchTerm === data.s ) {