X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/53f4633144ed68c8b8fb5861f992b5489894a940..16e7b37c7914d753890c1a05a9335f3b43751eb8:/wp-admin/user-edit.php?ds=sidebyside diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index 6143514f..2222ae26 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -38,6 +38,7 @@ else $profile_help = '
' . __('Your profile contains information about you (your “account”) as well as some personal options related to using WordPress.') . '
' . '' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '
' . + '' . __( 'You can select the language you wish to use while using the WordPress administration screen without affecting the language site visitors see.' ) . '
' . '' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '
' . '' . __( 'You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button.' ) . '
' . '' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '
' . @@ -51,32 +52,16 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '' . __('For more information:') . '
' . - '' . __('Documentation on User Profiles') . '
' . - '' . __('Support Forums') . '
' + '' . __('Documentation on User Profiles') . '
' . + '' . __('Support Forums') . '
' ); -$wp_http_referer = remove_query_arg(array('update', 'delete_count'), $wp_http_referer ); +$wp_http_referer = remove_query_arg( array( 'update', 'delete_count', 'user_id' ), $wp_http_referer ); $user_can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ); /** - * Optional SSL preference that can be turned on by hooking to the 'personal_options' action. - * - * @since 2.7.0 - * - * @param object $user User data object - */ -function use_ssl_preference($user) { -?> -- + + +
\n
", $errors->get_error_messages() ); ?>
+ + + | ++ locale; + + if ( 'en_US' === $user_locale ) { + $user_locale = ''; + } elseif ( '' === $user_locale || ! in_array( $user_locale, $languages, true ) ) { + $user_locale = 'site-default'; + } + + wp_dropdown_languages( array( + 'name' => 'locale', + 'id' => 'locale', + 'selected' => $user_locale, + 'languages' => $languages, + 'show_available_translations' => false, + 'show_option_site_default' => true + ) ); + ?> + | +
---|
+ |
ID . '_new_email' );
+ $new_email = get_user_meta( $current_user->ID, '_new_email', true );
if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) : ?>
Cancel' ),
- ' ' . esc_html( $new_email['newemail'] ) . ' '
+ );
+ printf(
+ ' %2$s',
+ esc_url( wp_nonce_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ), 'dismiss-' . $current_user->ID . '_new_email' ) ),
+ __( 'Cancel' )
+ );
+ ?>
|
@@ -425,7 +461,7 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
---|
+ |
+
+ Gravatar.' ), + __( 'https://en.gravatar.com/' ) + ); + } else { + $description = ''; + } + + /** + * Filters the user profile picture description displayed under the Gravatar. + * + * @since 4.4.0 + * @since 4.7.0 Added the `$profileuser` parameter. + * + * @param string $description The description that will be printed. + * @param WP_User $profileuser The current WP_User object. + */ + echo apply_filters( 'user_profile_picture_description', $description, $profileuser ); + ?> + |
+
---|
- + |