Changeset 21876
- Timestamp:
- 09/16/2012 10:33:24 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/user.php
r21794 r21876 1301 1301 return new WP_Error('existing_user_email', __('This email address is already registered.') ); 1302 1302 1303 if ( empty($display_name) )1304 $display_name = $user_login;1305 $display_name = apply_filters('pre_user_display_name', $display_name);1306 1307 1303 if ( empty($nickname) ) 1308 1304 $nickname = $user_login; … … 1316 1312 $last_name = ''; 1317 1313 $last_name = apply_filters('pre_user_last_name', $last_name); 1314 1315 if ( empty( $display_name ) ) { 1316 if ( $update ) 1317 $display_name = $user_login; 1318 elseif ( $first_name && $last_name ) 1319 /* translators: 1: first name, 2: last name */ 1320 $display_name = sprintf( _x( '%1$s %2$s', 'Display name based on first name and last name' ), $first_name, $last_name ); 1321 elseif ( $first_name ) 1322 $display_name = $first_name; 1323 elseif ( $last_name ) 1324 $display_name = $last_name; 1325 else 1326 $display_name = $user_login; 1327 } 1328 $display_name = apply_filters( 'pre_user_display_name', $display_name ); 1318 1329 1319 1330 if ( empty($description) )
Note: See TracChangeset
for help on using the changeset viewer.