Changeset 17587

Timestamp:

04/01/2011 08:40:16 PM (14 years ago)

Author:

azaozz

Message:

Fix display of apostrophes in the user's first and last names on the User Profile page, partial props andrewryno, see #17004

Location:

trunk

Files:

• wp-admin/js/user-profile.dev.js (modified) (1 diff)
• wp-admin/js/user-profile.js (modified) (1 diff)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -30 +30 @@
     }
 
-    $(document).ready( function() {
+    $(document).ready(function() {
         $('#pass1').val('').keyup( check_pass_strength );
         $('#pass2').val('').keyup( check_pass_strength );
         $('#pass-strength-result').show();
         $('.color-palette').click(function(){$(this).siblings('input[name=admin_color]').attr('checked', 'checked')});
-        $('#nickname').blur(function(){
-            var str = $(this).val() || $('#user_login').val();
-            var select = $('#display_name');
-            var sel = select.children('option:selected').attr('id');
-            select.children('#display_nickname').remove();
-            if ( ! select.children('option[value=' + str + ']').length )
-                select.append('<option id="display_nickname" value="' + str + '">' + str + '</option>');
-            $('#'+sel).attr('selected', 'selected');
+        $('#first_name, #last_name, #nickname').blur(function(){
+            var select = $('#display_name'), current = select.find('option:selected').attr('id'), dub = [],
+                inputs = {
+                    display_nickname : $('#nickname').val(),
+                    display_username : $('#user_login').val(),
+                    display_firstname : $('#first_name').val(),
+                    display_lastname : $('#last_name').val()
+                };
+
+            if ( inputs.display_firstname && inputs.display_lastname ) {
+                inputs['display_firstlast'] = inputs.display_firstname + ' ' + inputs.display_lastname;
+                inputs['display_lastfirst'] = inputs.display_lastname + ' ' + inputs.display_firstname;
+            }
+
+            $('option', select).remove();
+            $.each(inputs, function( id, value ) {
+                var selected;
+
+                if ( inputs[id].length && $.inArray( value, dub ) == -1 ) {
+                    dub.push(value);
+                    selected = id == current ? 'selected="selected"' : '';
+                    select.append('<option id="' + id + '" ' + selected + '">' + value + '</option>');
+                }
+            });
         });
-        $('#first_name, #last_name').blur(function(){
-            var select = $('#display_name');
-            var first = $('#first_name').val(), last = $('#last_name').val();
-            var sel = select.children('option:selected').attr('id');
-            $('#display_firstname, #display_lastname, #display_firstlast, #display_lastfirst').remove();
-            if ( first && ! select.children('option[value=' + first + ']').length )
-                select.append('<option id="display_firstname" value="' + first + '">' + first + '</option>');
-            if ( last && ! select.children('option[value=' + last + ']').length )
-                select.append('<option id="display_lastname" value="' + last + '">' + last + '</option>');
-            if ( first && last ) {
-                if ( ! select.children('option[value=' + first + ' ' + last + ']').length )
-                    select.append('<option id="display_firstlast" value="' + first + ' ' + last + '">' + first + ' ' + last + '</option>');
-                if ( ! select.children('option[value=' + last + ' ' + first + ']').length )
-                    select.append('<option id="display_lastfirst" value="' + last + ' ' + first + '">' + last + ' ' + first + '</option>');
-            }
-            $('#'+sel).attr('selected', 'selected');
-        });
-    });
+    });
 
 })(jQuery);

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

@@ -1 @@
-(function(a){function b(){var e=a("#pass1").val(),d=a("#user_login").val(),c=a("#pass2").val(),f;a("#pass-strength-result").removeClass("short bad good strong");if(!e){a("#pass-strength-result").html(pwsL10n.empty);return}f=passwordStrength(e,d,c);switch(f){case 2:a("#pass-strength-result").addClass("bad").html(pwsL10n.bad);break;case 3:a("#pass-strength-result").addClass("good").html(pwsL10n.good);break;case 4:a("#pass-strength-result").addClass("strong").html(pwsL10n.strong);break;case 5:a("#pass-strength-result").addClass("short").html(pwsL10n.mismatch);break;default:a("#pass-strength-result").addClass("short").html(pwsL10n["short"])}}a(document).ready(function(){a("#pass1").val("").keyup(b);a("#pass2").val("").keyup(b);a("#pass-strength-result").show();a(".color-palette").click(function(){a(this).siblings("input[name=admin_color]").attr("checked","checked")});a("#nickname").blur(function(){var e=a(this).val()||a("#user_login").val();var c=a("#display_name");var d=c.children("option:selected").attr("id");c.children("#display_nickname").remove();if(!c.children("option[value="+e+"]").length){c.append('<option id="display_nickname" value="'+e+'">'+e+"</option>")}a("#"+d).attr("selected","selected")});a("#first_name, #last_name").blur(function(){var c=a("#display_name");var f=a("#first_name").val(),d=a("#last_name").val();var e=c.children("option:selected").attr("id");a("#display_firstname, #display_lastname, #display_firstlast, #display_lastfirst").remove();if(f&&!c.children("option[value="+f+"]").length){c.append('<option id="display_firstname" value="'+f+'">'+f+"</option>")}if(d&&!c.children("option[value="+d+"]").length){c.append('<option id="display_lastname" value="'+d+'">'+d+"</option>")}if(f&&d){if(!c.children("option[value="+f+" "+d+"]").length){c.append('<option id="display_firstlast" value="'+f+" "+d+'">'+f+" "+d+"</option>")}if(!c.children("option[value="+d+" "+f+"]").length){c.append('<option id="display_lastfirst" value="'+d+" "+f+'">'+d+" "+f+"</option>")}}a("#"+e).attr("selected","selected")})})})(jQuery);
+(function(a){function b(){var e=a("#pass1").val(),d=a("#user_login").val(),c=a("#pass2").val(),f;a("#pass-strength-result").removeClass("short bad good strong");if(!e){a("#pass-strength-result").html(pwsL10n.empty);return}f=passwordStrength(e,d,c);switch(f){case 2:a("#pass-strength-result").addClass("bad").html(pwsL10n.bad);break;case 3:a("#pass-strength-result").addClass("good").html(pwsL10n.good);break;case 4:a("#pass-strength-result").addClass("strong").html(pwsL10n.strong);break;case 5:a("#pass-strength-result").addClass("short").html(pwsL10n.mismatch);break;default:a("#pass-strength-result").addClass("short").html(pwsL10n["short"])}}a(document).ready(function(){a("#pass1").val("").keyup(b);a("#pass2").val("").keyup(b);a("#pass-strength-result").show();a(".color-palette").click(function(){a(this).siblings("input[name=admin_color]").attr("checked","checked")});a("#first_name, #last_name, #nickname").blur(function(){var c=a("#display_name"),e=c.find("option:selected").attr("id"),f=[],d={display_nickname:a("#nickname").val(),display_username:a("#user_login").val(),display_firstname:a("#first_name").val(),display_lastname:a("#last_name").val()};if(d.display_firstname&&d.display_lastname){d.display_firstlast=d.display_firstname+" "+d.display_lastname;d.display_lastfirst=d.display_lastname+" "+d.display_firstname}a("option",c).remove();a.each(d,function(i,h){var g;if(d[i].length&&a.inArray(h,f)==-1){f.push(h);g=i==e?'selected="selected"':"";c.append('<option id="'+i+'" '+g+'">'+h+"</option>")}})})})})(jQuery);

trunk/wp-admin/user-edit.php

@@ -282 +282 @@
         <?php
             $public_display = array();
+            $public_display['display_nickname']  = $profileuser->nickname;
             $public_display['display_username']  = $profileuser->user_login;
-            $public_display['display_nickname']  = $profileuser->nickname;
+
             if ( !empty($profileuser->first_name) )
                 $public_display['display_firstname'] = $profileuser->first_name;
+
             if ( !empty($profileuser->last_name) )
                 $public_display['display_lastname'] = $profileuser->last_name;
+
             if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
                 $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
                 $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>
+            <option id="<?php echo $id; ?>"<?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
         <?php
             }

trunk/wp-includes/script-loader.php

@@ -260 +260 @@
     ) );
 
-    $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20110113' );
+    $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20110401' );
     $scripts->add_data( 'user-profile', 'group', 1 );