Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-29 23:57:41 +02:00
Code Issues Projects Releases Wiki Activity

Make plugin search & order methods, instead of standalone functions. See #14579

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15912 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu 2010-10-22 11:08:35 +00:00
parent ac2ca038ea
commit 379f54ff30
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
wp-admin/includes/default-list-tables.php
View File

@ -3326,19 +3326,8 @@ class WP_Plugins_Table extends WP_List_Table {
$plugins['upgrade'] = array();
if ( $s ) {
function _search_plugins_filter_callback( $plugin ) {
static $term;
if ( is_null( $term ) )
$term = stripslashes( $_REQUEST['s'] );
foreach ( $plugin as $value )
if ( stripos( $value, $term ) !== false )
return true;
return false;
}
$status = 'search';
$plugins['search'] = array_filter( $plugins['all'], '_search_plugins_filter_callback' );
$plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
}
$totals = array();
@ -3355,21 +3344,7 @@ class WP_Plugins_Table extends WP_List_Table {
$orderby = ucfirst( $orderby );
$order = strtoupper( $order );
function _order_plugins_callback( $plugin_a, $plugin_b ) {
global $orderby, $order;
$a = $plugin_a[$orderby];
$b = $plugin_b[$orderby];
if ( $a == $b )
return 0;
if ( 'DESC' == $order )
return ( $a < $b ) ? 1 : -1;
else
return ( $a < $b ) ? -1 : 1;
}
uasort( $this->items, '_order_plugins_callback' );
uasort( $this->items, array( $this, '_order_callback' ) );
}
$plugins_per_page = $this->get_items_per_page( 'plugins_per_page', 999 );
@ -3385,6 +3360,33 @@ class WP_Plugins_Table extends WP_List_Table {
) );
}
function _search_callback( $plugin ) {
static $term;
if ( is_null( $term ) )
$term = stripslashes( $_REQUEST['s'] );
foreach ( $plugin as $value )
if ( stripos( $value, $term ) !== false )
return true;
return false;
}
function _order_callback( $plugin_a, $plugin_b ) {
global $orderby, $order;
$a = $plugin_a[$orderby];
$b = $plugin_b[$orderby];
if ( $a == $b )
return 0;
if ( 'DESC' == $order )
return ( $a < $b ) ? 1 : -1;
else
return ( $a < $b ) ? -1 : 1;
}
function no_items() {
global $plugins;