Changeset 38091

Timestamp:

07/18/2016 01:59:17 PM (8 years ago)

Author:

ocean90

Message:

Plugins: Use the correct admin screen when searching for plugins via Ajax.

Both list tables provide different actions based on where they are loaded, regular admin or network admin. Since there is only one Ajax handler for both screens we have to set the current screen before using the list tables.

Props swissspidy, ocean90.
Fixes #37373.

Location:

trunk/src/wp-admin

Files:

• includes/ajax-actions.php (modified) (3 diffs)
• js/updates.js (modified) (4 diffs)

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

@@ -3782 +3782 @@
  * @since 4.6.0
  *
- * @global WP_List_Table $wp_list_table Current list table instance.
- * @global string        $hook_suffix   Current admin page.
- * @global string        $s             Search term.
+ * @global string $s Search term.
  */
 function wp_ajax_search_plugins() {
     check_ajax_referer( 'updates' );
 
-    global $wp_list_table, $hook_suffix, $s;
-    $hook_suffix = 'plugins.php';
+    $pagenow = isset( $_POST['pagenow'] ) ? sanitize_key( $_POST['pagenow'] ) : '';
+    if ( 'plugins-network' === $pagenow || 'plugins' === $pagenow ) {
+        set_current_screen( $pagenow );
+    }
 
     /** @var WP_Plugins_List_Table $wp_list_table */
-    $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
-    $status        = array();
+    $wp_list_table = _get_list_table( 'WP_Plugins_List_Table', array(
+        'screen' => get_current_screen(),
+    ) );
+
+    $status = array();
 
     if ( ! $wp_list_table->ajax_user_can() ) {
@@ -3807 +3810 @@
     ) ), network_admin_url( 'plugins.php', 'relative' ) );
 
-    $s = sanitize_text_field( $_POST['s'] );
+    $GLOBALS['s'] = wp_unslash( $_POST['s'] );
 
     $wp_list_table->prepare_items();
@@ -3823 +3826 @@
  *
  * @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 = isset( $_POST['pagenow'] ) ? sanitize_key( $_POST['pagenow'] ) : '';
+    if ( 'plugin-install-network' === $pagenow || 'plugin-install' === $pagenow ) {
+        set_current_screen( $pagenow );
+    }
 
     /** @var WP_Plugin_Install_List_Table $wp_list_table */
-    $wp_list_table = _get_list_table( 'WP_Plugin_Install_List_Table' );
-    $status        = array();
+    $wp_list_table = _get_list_table( 'WP_Plugin_Install_List_Table', array(
+        'screen' => get_current_screen(),
+    ) );
+
+    $status = array();
 
     if ( ! $wp_list_table->ajax_user_can() ) {

trunk/src/wp-admin/js/updates.js

@@ -2032 +2032 @@
                 data  = _.extend( {
                     _ajax_nonce: wp.updates.ajaxNonce,
-                    s:           $( '<p />' ).html( $( this ).val() ).text(),
+                    s:           $( this ).val(),
                     tab:         'search',
-                    type:        $( '#typeselector' ).val()
+                    type:        $( '#typeselector' ).val(),
+                    pagenow:     pagenow
                 }, { type: 'term' } );
 
@@ -2044 +2045 @@
 
             if ( history.pushState ) {
-                history.pushState( null, '', location.href.split( '?' )[ 0 ] + '?' + $.param( _.omit( data, '_ajax_nonce' ) ) );
+                history.pushState( null, '', location.href.split( '?' )[ 0 ] + '?' + $.param( _.omit( data, [ '_ajax_nonce', 'pagenow' ] ) ) );
             }
 
@@ -2072 +2073 @@
             var data = {
                 _ajax_nonce: wp.updates.ajaxNonce,
-                s:           event.target.value
+                s:           event.target.value,
+                pagenow:     pagenow
             };
 
@@ -2100 +2102 @@
 
                 // Can we just ditch this whole subtitle business?
-                var $subTitle    = $( '<span />' ).addClass( 'subtitle' ).html( wp.updates.l10n.searchResults.replace( '%s', data.s ) ),
+                var $subTitle    = $( '<span />' ).addClass( 'subtitle' ).html( wp.updates.l10n.searchResults.replace( '%s', _.escape( data.s ) ) ),
                     $oldSubTitle = $( '.wrap .subtitle' );