Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Merge three similar strings.

Browse Source 
props pavelevap.
see #31013.
Built from https://develop.svn.wordpress.org/trunk@31717


git-svn-id: http://core.svn.wordpress.org/trunk@31698 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2015-03-11 15:25:28 +00:00
parent 31b7a7a762
commit 50c2cee32d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/class-wp-users-list-table.php
View File

@ -120,7 +120,7 @@ class WP_Users_List_Table extends WP_List_Table {
* @access public
*/
public function no_items() {
_e( 'No matching users were found.' );
_e( 'No users found.' );
}
/**

2
wp-admin/includes/deprecated.php
View File

@ -548,7 +548,7 @@ class WP_User_Search {
if ( $this->results )
$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // no limit
else
$this->search_errors = new WP_Error('no_matching_users_found', __('No matching users were found!'));
$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
}
/**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-alpha-31716';
$wp_version = '4.2-alpha-31717';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.