Ticket #10030: 10030.diff

wp-admin/js/user-profile.dev.js

@@ -31 +31 @@
                 $('.color-palette').click(function(){$(this).siblings('input[name=admin_color]').attr('checked', 'checked')});
                 $('#nickname').blur(function(){
                         var str = $(this).val() || $('#user_login').val();
-                        $('#display_name #display_nickname').val(str).html(str);
+                        $('#display_name #display_nickname').remove();
+                        if ( ! $('#display_name option[value=' + str + ']').length )
+                                $('#display_name').append('<option id="display_nickname" value="' + str + '">' + str + '</option>');
                 });
                 $('#first_name, #last_name').blur(function(){
                         var first = $('#first_name').val(), last = $('#last_name').val();
                         $('#display_firstname, #display_lastname, #display_firstlast, #display_lastfirst').remove();
-                        if ( first && last ) {
-                                $('#display_name').append('<option id="display_firstname" value="' + first + '">' + first + '</option>' +
-                                        '<option id="display_lastname" value="' + last + '">' + last + '</option>' +
-                                        '<option id="display_firstlast" value="' + first + ' ' + last + '">' + first + ' ' + last + '</option>' +
-                                        '<option id="display_lastfirst" value="' + last + ' ' + first + '">' + last + ' ' + first + '</option>');
-                        } else if ( first && !last ) {
+                        if ( first && ! $('#display_name option[value=' + first + ']').length )
                                 $('#display_name').append('<option id="display_firstname" value="' + first + '">' + first + '</option>');
-                        } else if ( !first && last ) {
+                        if ( last && ! $('#display_name option[value=' + last + ']').length )
                                 $('#display_name').append('<option id="display_lastname" value="' + last + '">' + last + '</option>');
+                        if ( first && last ) {
+                                if ( ! $('#display_name option[value=' + first + ' ' + last + ']').length )
+                                        $('#display_name').append('<option id="display_firstlast" value="' + first + ' ' + last + '">' + first + ' ' + last + '</option>');
+                                if ( ! $('#display_name option[value=' + last + ' ' + first + ']').length )
+                                        $('#display_name').append('<option id="display_lastfirst" value="' + last + ' ' + first + '">' + last + ' ' + first + '</option>');
                         }
                 });
     });

wp-admin/user-edit.php

@@ -256 +256 @@
                 <select name="display_name" id="display_name">
                 <?php
                         $public_display = array();
+                        $public_display['display_username']  = $profileuser->user_login;
                         $public_display['display_nickname']  = $profileuser->nickname;
-                        $public_display['display_username']  = $profileuser->user_login;
                         if ( !empty($profileuser->first_name) )
                                 $public_display['display_firstname'] = $profileuser->first_name;
                         if ( !empty($profileuser->last_name) )
@@ -266 +266 @@
                                 $public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
                                 $public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
                         }
-                        if ( !in_array( $profileuser->display_name, $public_display ) )// Only add this if it isn't duplicated elsewhere
+                        if ( !in_array( $profileuser->display_name, $public_display ) ) // Only add this if it isn't duplicated elsewhere
                                 $public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
                         $public_display = array_map( 'trim', $public_display );
+                        $public_display = array_unique( $public_display );
                         foreach ( $public_display as $id => $item ) {
                 ?>
                         <option id="<?php echo $id; ?>" value="<?php echo esc_attr($item); ?>"<?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>