' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. He or she can use the links under each site to visit either the frontend or the dashboard for that site.') . '
' . + '' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the frontend or the dashboard for that site.') . '
' . '' . __('Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user).') . '
' ) ); diff --git a/src/wp-admin/network/users.php b/src/wp-admin/network/users.php index 9db1561986..d13e5184d0 100644 --- a/src/wp-admin/network/users.php +++ b/src/wp-admin/network/users.php @@ -233,7 +233,7 @@ get_current_screen()->add_help_tab( array( 'title' => __('Overview'), 'content' => '' . __('This table shows all users across the network and the sites to which they are assigned.') . '
' . - '' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to his or her Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '
' . + '' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to their Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '
' . '' . __('You can also go to the user’s profile page by clicking on the individual username.') . '
' . '' . __('You can sort the table by clicking on any of the bold headings and switch between list and excerpt views by using the icons in the upper right.') . '
' . '' . __('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses.') . '
' . diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php index 53d16d7572..6099904941 100644 --- a/src/wp-admin/user-edit.php +++ b/src/wp-admin/user-edit.php @@ -120,7 +120,7 @@ if ( !is_multisite() ) { if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) ); - // WPMU must delete the user from the current blog if WP added him after editing. + // We must delete the user from the current blog if WP added them after editing. $delete_role = false; $blog_prefix = $wpdb->get_blog_prefix(); if ( $user_id != $current_user->ID ) { diff --git a/src/wp-includes/ms-functions.php b/src/wp-includes/ms-functions.php index 5a1d20df7d..4e3a6b0317 100644 --- a/src/wp-includes/ms-functions.php +++ b/src/wp-includes/ms-functions.php @@ -51,7 +51,7 @@ function get_admin_users_for_domain( $sitedomain = '', $path = '' ) { /** * Get one of a user's active blogs * - * Returns the user's primary blog, if she has one and + * Returns the user's primary blog, if they have one and * it is active. If it's inactive, function returns another * active blog of the user. If none are found, the user * is added as a Subscriber to the Dashboard Blog and that blog @@ -1187,7 +1187,7 @@ function install_blog_defaults($blog_id, $user_id) { } /** - * Notify a user that her blog activation has been successful. + * Notify a user that their blog activation has been successful. * * Filter 'wpmu_welcome_notification' to disable or bypass. * @@ -1253,7 +1253,7 @@ We hope you enjoy your new site. Thanks! } /** - * Notify a user that her account activation has been successful. + * Notify a user that their account activation has been successful. * * Filter 'wpmu_welcome_user_notification' to disable or bypass. *