<!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>[17189] trunk:
Default to leading and trailing wildcards for site user searches.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17189">17189</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-12-30 23:38:21 +0000 (Thu, 30 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Default to leading and trailing wildcards for site user searches. Require explicit trailing wildcard asterisk request for network user searches. Disallow leading wildcards for network user searches. Move wildcard policy up the stake, allowing more flexibility in WP_User_Query. Props SergeyBiryukov. fixes <a href="http://trac.wordpress.org/ticket/16014">#16014</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpmsuserslisttablephp">trunk/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpuserslisttablephp">trunk/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-users-list-table.php (17188 => 17189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2010-12-30 21:58:44 UTC (rev 17188)
+++ trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2010-12-30 23:38:21 UTC (rev 17189)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> 'fields' => 'all_with_meta'
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+ $args['search'] = ltrim($args['search'], '*');
+
</ins><span class="cx"> if ( $role == 'super' ) {
</span><span class="cx"> $logins = implode( "', '", get_super_admins() );
</span><span class="cx"> $args['include'] = $wpdb->get_col( "SELECT ID FROM $wpdb->users WHERE user_login IN ('$logins')" );
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-users-list-table.php (17188 => 17189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-users-list-table.php 2010-12-30 21:58:44 UTC (rev 17188)
+++ trunk/wp-admin/includes/class-wp-users-list-table.php 2010-12-30 23:38:21 UTC (rev 17189)
</span><span class="lines">@@ -51,6 +51,8 @@
</span><span class="cx"> 'fields' => 'all_with_meta'
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+ $args['search'] = '*' . $args['search'] . '*';
+
</ins><span class="cx"> if ( $this->is_site_users )
</span><span class="cx"> $args['blog_id'] = $this->site_id;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (17188 => 17189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-12-30 21:58:44 UTC (rev 17188)
+++ trunk/wp-includes/user.php 2010-12-30 23:38:21 UTC (rev 17189)
</span><span class="lines">@@ -465,11 +465,19 @@
</span><span class="cx">
</span><span class="cx"> $search = trim( $qv['search'] );
</span><span class="cx"> if ( $search ) {
</span><del>- $wild = false;
- if ( false !== strpos($search, '*') ) {
- $wild = true;
</del><ins>+ $leading_wild = ( ltrim($search, '*') != $search );
+ $trailing_wild = ( rtrim($search, '*') != $search );
+ if ( $leading_wild && $trailing_wild )
+ $wild = 'both';
+ elseif ( $leading_wild )
+ $wild = 'leading';
+ elseif ( $trailing_wild )
+ $wild = 'trailing';
+ else
+ $wild = false;
+ if ( $wild )
</ins><span class="cx"> $search = trim($search, '*');
</span><del>- }
</del><ins>+
</ins><span class="cx"> if ( false !== strpos( $search, '@') )
</span><span class="cx"> $search_columns = array('user_email');
</span><span class="cx"> elseif ( is_numeric($search) )
</span><span class="lines">@@ -564,19 +572,21 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $string
</span><span class="cx"> * @param array $cols
</span><del>- * @param bool $wild Whether to allow trailing wildcard searches. Default is false.
</del><ins>+ * @param bool $wild Whether to allow wildcard searches. Default is false for Network Admin, true for
+ * single site. Single site allows leading and trailing wildcards, Network Admin only trailing.
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_search_sql( $string, $cols, $wild = false ) {
</span><span class="cx"> $string = esc_sql( $string );
</span><span class="cx">
</span><span class="cx"> $searches = array();
</span><del>- $wild_char = ( $wild ) ? '%' : '';
</del><ins>+ $leading_wild = ( 'leading' == $wild || 'both' == $wild ) ? '%' : '';
+ $trailing_wild = ( 'trailing' == $wild || 'both' == $wild ) ? '%' : '';
</ins><span class="cx"> foreach ( $cols as $col ) {
</span><span class="cx"> if ( 'ID' == $col )
</span><span class="cx"> $searches[] = "$col = '$string'";
</span><span class="cx"> else
</span><del>- $searches[] = "$col LIKE '" . like_escape($string) . "$wild_char'";
</del><ins>+ $searches[] = "$col LIKE '$leading_wild" . like_escape($string) . "$trailing_wild'";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return ' AND (' . implode(' OR ', $searches) . ')';
</span></span></pre>
</div>
</div>
</body>
</html>