Ticket #27316: 27316.diff

wp-admin/includes/plugin-install.php

@@ -206 +206 @@
  */
 function install_plugins_favorites_form() {
         $user = ! empty( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
+        $search = ! empty( $_GET['search'] ) ? wp_unslash( $_GET['search'] ) : '';
         ?>
         <p class="install-help"><?php _e( 'If you have marked plugins as favorites on WordPress.org, you can browse them here.' ); ?></p>
         <form method="get" action="">
@@ -213 +214 @@
                 <p>
                         <label for="user"><?php _e( 'Your WordPress.org username:' ); ?></label>
                         <input type="search" id="user" name="user" value="<?php echo esc_attr( $user ); ?>" />
+                        (<input type="search" id="search" name="search" value="<?php echo esc_attr( $search ); ?>" placeholder="<?php _e( 'Search' ); ?>" />)
                         <input type="submit" class="button" value="<?php esc_attr_e( 'Get Favorites' ); ?>" />
                 </p>
         </form>
@@ -450 +452 @@
         exit;
 }
 add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
+

wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -91 +91 @@
                         case 'favorites':
                                 $user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
                                 update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
-                                if ( $user )
+                                if ( $user ){
                                         $args['user'] = $user;
-                                else
+
+                                        $search = isset( $_GET['search'] ) ? wp_unslash( $_GET['search'] ) : false;
+                                        if ($search)
+                                                $args['s'] = $search;
+                                } else {
                                         $args = false;
+                                }
 
                                 add_action( 'install_plugins_favorites', 'install_plugins_favorites_form', 9, 0 );
                                 break;
@@ -120 +125 @@
                 if ( !$args )
                         return;
 
+                if ( isset( $args['s'] ) ){
+                        $per_page_limit = $args['per_page'];
+                        $args['per_page'] = -1;
+                }
+                
                 $api = plugins_api( 'query_plugins', $args );
 
                 if ( is_wp_error( $api ) )
                         wp_die( $api->get_error_message() . '</p> <p class="hide-if-no-js"><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a>' );
 
                 $this->items = $api->plugins;
+                if( isset( $args['s'] )){
+                        $args['per_page'] = $per_page_limit;
 
+                        foreach ($this->items as $key => $item){
+                                if (stripos($item->name, $args['s']) === false){
+                                        unset ($this->items[ $key ]);
+                                        $api->info['results']--;
+                                }
+                        }
+
+                        if ( isset( $args['page']) ){
+                                $this->items = array_slice( $this->items, min( ( $args['page'] * $args['per_page'] ) - $args['per_page'], sizeof ($this->items) ) );
+                        }
+                }
+
                 $this->set_pagination_args( array(
                         'total_items' => $api->info['results'],
                         'per_page' => $args['per_page'],
@@ -278 +302 @@
                 }
         }
 }
+