sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow user searches to match the display_name field.

Browse Source 
Props bcole808, pcarvalho.
Fixes #39643.

git-svn-id: https://develop.svn.wordpress.org/trunk@40982 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2017-07-01 14:21:50 +00:00
parent 107c937394
commit 6bf8783afd
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wp-includes/class-wp-user-query.php
View File

@ -522,8 +522,9 @@ class WP_User_Query {
$search = trim($search, '*'); $search = trim($search, '*');
$search_columns = array(); $search_columns = array();
if ( $qv['search_columns'] ) if ( $qv['search_columns'] ) {
$search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename' ) ); $search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename', 'display_name' ) );
}
if ( ! $search_columns ) { if ( ! $search_columns ) {
if ( false !== strpos( $search, '@') ) if ( false !== strpos( $search, '@') )
$search_columns = array('user_email'); $search_columns = array('user_email');

48
tests/phpunit/tests/user/query.php
View File

@ -1386,4 +1386,52 @@ class Tests_User_Query extends WP_UnitTestCase {
$this->assertSame( $r1, $r2 ); $this->assertSame( $r1, $r2 );
$this->assertSame( $r1, $r3 ); $this->assertSame( $r1, $r3 );
} }
/**
* @ticket 39643
*/
public function test_search_by_display_name_only() {
$new_user1 = $this->factory->user->create( array(
'user_login' => 'name1',
'display_name' => 'Sophia Andresen',
) );
self::$author_ids[] = $new_user1;
$q = new WP_User_Query( array(
'search' => '*Sophia*',
'fields' => '',
'search_columns' => array( 'display_name' ),
'include' => self::$author_ids,
) );
$ids = $q->get_results();
/* must include user that has same string in display_name */
$this->assertEquals( array( $new_user1 ), $ids );
}
/**
* @ticket 39643
*/
public function test_search_by_display_name_only_ignore_others() {
$new_user1 = $this->factory->user->create( array(
'user_login' => 'Sophia Andresen',
'display_name' => 'name1',
) );
self::$author_ids[] = $new_user1;
$q = new WP_User_Query( array(
'search' => '*Sophia*',
'fields' => '',
'search_columns' => array( 'display_name' ),
'include' => self::$author_ids,
) );
$ids = $q->get_results();
/* must not include user that has same string in other fields */
$this->assertEquals( array(), $ids );
}
} }