Changeset 15912

Timestamp:

10/22/2010 11:08:35 AM (16 years ago)

Author:

scribu

Message:

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

File:

• trunk/wp-admin/includes/default-list-tables.php (modified) (3 diffs)

trunk/wp-admin/includes/default-list-tables.php

@@ -3327 +3327 @@
 
                 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' ) );
                 }
 
@@ -3356 +3345 @@
                         $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' ) );
                 }
 
@@ -3384 +3359 @@
                         'per_page' => $plugins_per_page,
                 ) );
+        }
+
+        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;
         }