<!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>[16170] trunk/wp-includes:
Allow trailing wildcard user searches by appending *.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16170">16170</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-11-03 19:31:11 +0000 (Wed, 03 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow trailing wildcard user searches by appending *. see <a href="http://trac.wordpress.org/ticket/15170">#15170</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpobjectqueryphp">trunk/wp-includes/class-wp-object-query.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpobjectqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-object-query.php (16169 => 16170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-object-query.php 2010-11-03 19:26:23 UTC (rev 16169)
+++ trunk/wp-includes/class-wp-object-query.php 2010-11-03 19:31:11 UTC (rev 16170)
</span><span class="lines">@@ -227,17 +227,19 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $string
</span><span class="cx"> * @param array $cols
</span><ins>+ * @param bool $wild Whether to allow trailing wildcard searches. Default is false.
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>- function get_search_sql( $string, $cols ) {
</del><ins>+ function get_search_sql( $string, $cols, $wild = false ) {
</ins><span class="cx"> $string = esc_sql( $string );
</span><span class="cx">
</span><span class="cx"> $searches = array();
</span><ins>+ $wild_char = ( $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 '$string%'";
</del><ins>+ $searches[] = "$col LIKE '$string$wild_char'";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return ' AND (' . implode(' OR ', $searches) . ')';
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (16169 => 16170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-11-03 19:26:23 UTC (rev 16169)
+++ trunk/wp-includes/user.php 2010-11-03 19:31:11 UTC (rev 16170)
</span><span class="lines">@@ -446,6 +446,11 @@
</span><span class="cx">
</span><span class="cx"> $search = trim( $qv['search'] );
</span><span class="cx"> if ( $search ) {
</span><ins>+ $wild = false;
+ if ( false !== strpos($search, '*') ) {
+ $wild = 'true';
+ $search = trim($search, '*');
+ }
</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">@@ -455,7 +460,7 @@
</span><span class="cx"> else
</span><span class="cx"> $search_columns = array('user_login', 'user_nicename', 'display_name');
</span><span class="cx">
</span><del>- $this->query_where .= $this->get_search_sql( $search, $search_columns );
</del><ins>+ $this->query_where .= $this->get_search_sql( $search, $search_columns, $wild );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $this->parse_meta_query( $qv );
</span></span></pre>
</div>
</div>
</body>
</html>