From 04f6979a13ccd812088c5c5e0af7d59ddb1db866 Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 9 Apr 2012 18:46:36 +0000
Subject: [PATCH] Don't try to append "Display Name" options when on the Add
 New User screen (the <select> doesn't exist there), props pbiron,
 SergeyBiryukov, fixes #20392

git-svn-id: http://svn.automattic.com/wordpress/trunk@20407 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/js/user-profile.dev.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/wp-admin/js/user-profile.dev.js b/wp-admin/js/user-profile.dev.js
index 3c60a4593..41991f57e 100644
--- a/wp-admin/js/user-profile.dev.js
+++ b/wp-admin/js/user-profile.dev.js
@@ -35,13 +35,19 @@
 		$('#pass-strength-result').show();
 		$('.color-palette').click(function(){$(this).siblings('input[name="admin_color"]').prop('checked', true)});
 		$('#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()
-				};
+			var select = $('#display_name'), current, dub = [], inputs;
+
+			if ( !select.length )
+				return;
+
+			current = select.find('option:selected').attr('id');
+
+			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;
@@ -50,6 +56,9 @@
 
 			$('option', select).remove();
 			$.each(inputs, function( id, value ) {
+				if ( !value )
+					return;
+
 				var val = value.replace(/<\/?[a-z][^>]*>/gi, '');
 
 				if ( inputs[id].length && $.inArray( val, dub ) == -1 ) {