golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow trailing wildcard user searches by appending *. see #15170 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16170 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-11-03 19:31:11 +00:00
parent 1e95d0f38e
commit 4bebab39b1
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/class-wp-object-query.php
View File

@ -227,17 +227,19 @@ class WP_Object_Query {
* *
* @param string $string * @param string $string
* @param array $cols * @param array $cols
* @param bool $wild Whether to allow trailing wildcard searches. Default is false.
* @return string * @return string
*/ */
function get_search_sql( $string, $cols ) { function get_search_sql( $string, $cols, $wild = false ) {
$string = esc_sql( $string ); $string = esc_sql( $string );
$searches = array(); $searches = array();
$wild_char = ( $wild ) ? '%' : '';
foreach ( $cols as $col ) { foreach ( $cols as $col ) {
if ( 'ID' == $col ) if ( 'ID' == $col )
$searches[] = "$col = '$string'"; $searches[] = "$col = '$string'";
else else
$searches[] = "$col LIKE '$string%'"; $searches[] = "$col LIKE '$string$wild_char'";
} }
return ' AND (' . implode(' OR ', $searches) . ')'; return ' AND (' . implode(' OR ', $searches) . ')';

7
wp-includes/user.php
View File

@ -446,6 +446,11 @@ class WP_User_Query extends WP_Object_Query {
$search = trim( $qv['search'] ); $search = trim( $qv['search'] );
if ( $search ) { if ( $search ) {
$wild = false;
if ( false !== strpos($search, '*') ) {
$wild = 'true';
$search = trim($search, '*');
}
if ( false !== strpos( $search, '@') ) if ( false !== strpos( $search, '@') )
$search_columns[] = array('user_email'); $search_columns[] = array('user_email');
elseif ( is_numeric($search) ) elseif ( is_numeric($search) )
@ -455,7 +460,7 @@ class WP_User_Query extends WP_Object_Query {
else else
$search_columns = array('user_login', 'user_nicename', 'display_name'); $search_columns = array('user_login', 'user_nicename', 'display_name');
$this->query_where .= $this->get_search_sql( $search, $search_columns ); $this->query_where .= $this->get_search_sql( $search, $search_columns, $wild );
} }
$this->parse_meta_query( $qv ); $this->parse_meta_query( $qv );