<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15912] trunk/wp-admin/includes/default-list-tables.php:
Make plugin search & order methods, instead of standalone functions.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15912">15912</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-22 11:08:35 +0000 (Fri, 22 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make plugin search & order methods, instead of standalone functions. See <a href="http://trac.wordpress.org/ticket/14579">#14579</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdefaultlisttablesphp">trunk/wp-admin/includes/default-list-tables.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15911 => 15912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-10-22 10:27:35 UTC (rev 15911)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-10-22 11:08:35 UTC (rev 15912)
</span><span class="lines">@@ -3326,19 +3326,8 @@
</span><span class="cx"> $plugins['upgrade'] = array();
</span><span class="cx">
</span><span class="cx"> if ( $s ) {
</span><del>- 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;
- }
</del><span class="cx"> $status = 'search';
</span><del>- $plugins['search'] = array_filter( $plugins['all'], '_search_plugins_filter_callback' );
</del><ins>+ $plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $totals = array();
</span><span class="lines">@@ -3355,21 +3344,7 @@
</span><span class="cx"> $orderby = ucfirst( $orderby );
</span><span class="cx"> $order = strtoupper( $order );
</span><span class="cx">
</span><del>- 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' );
</del><ins>+ uasort( $this->items, array( $this, '_order_callback' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $plugins_per_page = $this->get_items_per_page( 'plugins_per_page', 999 );
</span><span class="lines">@@ -3385,6 +3360,33 @@
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ 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;
+ }
+
</ins><span class="cx"> function no_items() {
</span><span class="cx"> global $plugins;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>