<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[17587] trunk: Fix display of apostrophes in the user'
s first and last names on the User Profile page, partial props andrewryno,
see #17004</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17587">17587</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-04-01 20:40:16 +0000 (Fri, 01 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix display of apostrophes in the user's first and last names on the User Profile page, partial props andrewryno, see <a href="http://trac.wordpress.org/ticket/17004">#17004</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsuserprofiledevjs">trunk/wp-admin/js/user-profile.dev.js</a></li>
<li><a href="#trunkwpadminjsuserprofilejs">trunk/wp-admin/js/user-profile.js</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjsuserprofiledevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/user-profile.dev.js (17586 => 17587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/user-profile.dev.js 2011-04-01 19:44:37 UTC (rev 17586)
+++ trunk/wp-admin/js/user-profile.dev.js 2011-04-01 20:40:16 UTC (rev 17587)
</span><span class="lines">@@ -29,37 +29,36 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $(document).ready( function() {
</del><ins>+ $(document).ready(function() {
</ins><span class="cx"> $('#pass1').val('').keyup( check_pass_strength );
</span><span class="cx"> $('#pass2').val('').keyup( check_pass_strength );
</span><span class="cx"> $('#pass-strength-result').show();
</span><span class="cx"> $('.color-palette').click(function(){$(this).siblings('input[name=admin_color]').attr('checked', 'checked')});
</span><del>- $('#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').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>');
</del><ins>+ $('#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;
</ins><span class="cx"> }
</span><del>- $('#'+sel).attr('selected', 'selected');
</del><ins>+
+ $('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>');
+ }
+ });
</ins><span class="cx"> });
</span><del>- });
</del><ins>+ });
</ins><span class="cx">
</span><span class="cx"> })(jQuery);
</span></span></pre></div>
<a id="trunkwpadminjsuserprofilejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/user-profile.js (17586 => 17587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/user-profile.js 2011-04-01 19:44:37 UTC (rev 17586)
+++ trunk/wp-admin/js/user-profile.js 2011-04-01 20:40:16 UTC (rev 17587)
</span><span class="lines">@@ -1 +1 @@
</span><del>-(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);
</del><span class="cx">\ No newline at end of file
</span><ins>+(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);
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (17586 => 17587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2011-04-01 19:44:37 UTC (rev 17586)
+++ trunk/wp-admin/user-edit.php 2011-04-01 20:40:16 UTC (rev 17587)
</span><span class="lines">@@ -281,23 +281,29 @@
</span><span class="cx"> <select name="display_name" id="display_name">
</span><span class="cx"> <?php
</span><span class="cx"> $public_display = array();
</span><ins>+ $public_display['display_nickname'] = $profileuser->nickname;
</ins><span class="cx"> $public_display['display_username'] = $profileuser->user_login;
</span><del>- $public_display['display_nickname'] = $profileuser->nickname;
</del><ins>+
</ins><span class="cx"> if ( !empty($profileuser->first_name) )
</span><span class="cx"> $public_display['display_firstname'] = $profileuser->first_name;
</span><ins>+
</ins><span class="cx"> if ( !empty($profileuser->last_name) )
</span><span class="cx"> $public_display['display_lastname'] = $profileuser->last_name;
</span><ins>+
</ins><span class="cx"> if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
</span><span class="cx"> $public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
</span><span class="cx"> $public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if ( !in_array( $profileuser->display_name, $public_display ) ) // Only add this if it isn't duplicated elsewhere
</span><span class="cx"> $public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
</span><ins>+
</ins><span class="cx"> $public_display = array_map( 'trim', $public_display );
</span><span class="cx"> $public_display = array_unique( $public_display );
</span><ins>+
</ins><span class="cx"> foreach ( $public_display as $id => $item ) {
</span><span class="cx"> ?>
</span><del>- <option id="<?php echo $id; ?>" value="<?php echo esc_attr($item); ?>"<?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
</del><ins>+ <option id="<?php echo $id; ?>"<?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (17586 => 17587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2011-04-01 19:44:37 UTC (rev 17586)
+++ trunk/wp-includes/script-loader.php 2011-04-01 20:40:16 UTC (rev 17587)
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> 'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20110113' );
</del><ins>+ $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20110401' );
</ins><span class="cx"> $scripts->add_data( 'user-profile', 'group', 1 );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20110131' );
</span></span></pre>
</div>
</div>
</body>
</html>