Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-26 06:13:07 +02:00
Code Issues Projects Releases Wiki Activity

Add a missing Oxford comma to the install screen. Fixes #30107. Props Ankit K Gupta.

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@30054


git-svn-id: http://core.svn.wordpress.org/trunk@30054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2014-10-28 18:32:18 +00:00
parent bc9446bd69
commit 3d99ef90d6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/install.php
View File

@ -118,7 +118,7 @@ function display_setup_form( $error = null ) {
echo '<input name="user_name" type="hidden" value="admin" />';
} else {
?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
<p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods and the @ symbol.' ); ?></p>
<p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol.' ); ?></p>
<?php
} ?>
</td>

2
wp-includes/version.php
View File

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