From 411e45256a8da64c780cc196d1e3258e007a72b9 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Sun, 16 Sep 2012 22:33:24 +0000 Subject: [PATCH] On user creation, default the display name to the first and last names provided. props mikelittle for the initial patch. fixes #20637. git-svn-id: https://develop.svn.wordpress.org/trunk@21876 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/user.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/wp-includes/user.php b/wp-includes/user.php index c99c1de103..a9ae2aa8b1 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -1300,10 +1300,6 @@ function wp_insert_user( $userdata ) { if ( !$update && ! defined( 'WP_IMPORTING' ) && email_exists($user_email) ) return new WP_Error('existing_user_email', __('This email address is already registered.') ); - if ( empty($display_name) ) - $display_name = $user_login; - $display_name = apply_filters('pre_user_display_name', $display_name); - if ( empty($nickname) ) $nickname = $user_login; $nickname = apply_filters('pre_user_nickname', $nickname); @@ -1316,6 +1312,21 @@ function wp_insert_user( $userdata ) { $last_name = ''; $last_name = apply_filters('pre_user_last_name', $last_name); + if ( empty( $display_name ) ) { + if ( $update ) + $display_name = $user_login; + elseif ( $first_name && $last_name ) + /* translators: 1: first name, 2: last name */ + $display_name = sprintf( _x( '%1$s %2$s', 'Display name based on first name and last name' ), $first_name, $last_name ); + elseif ( $first_name ) + $display_name = $first_name; + elseif ( $last_name ) + $display_name = $last_name; + else + $display_name = $user_login; + } + $display_name = apply_filters( 'pre_user_display_name', $display_name ); + if ( empty($description) ) $description = ''; $description = apply_filters('pre_user_description', $description);