From ca9480281cb3cb331788f8475b1e080bff59ec8d Mon Sep 17 00:00:00 2001 From: donncha Date: Mon, 21 Nov 2005 09:24:59 +0000 Subject: WP Merge git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@442 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-inst/wp-admin/admin-functions.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'wp-inst/wp-admin/admin-functions.php') diff --git a/wp-inst/wp-admin/admin-functions.php b/wp-inst/wp-admin/admin-functions.php index f0f862b..1c959b0 100644 --- a/wp-inst/wp-admin/admin-functions.php +++ b/wp-inst/wp-admin/admin-functions.php @@ -350,8 +350,6 @@ function edit_user($user_id = 0) { } if (isset ($_POST['first_name'])) $user->first_name = wp_specialchars(trim($_POST['first_name'])); - if (isset ($_POST['middle_name'])) - $user->middle_name = wp_specialchars(trim($_POST['middle_name'])); if (isset ($_POST['last_name'])) $user->last_name = wp_specialchars(trim($_POST['last_name'])); if (isset ($_POST['nickname'])) @@ -366,8 +364,6 @@ function edit_user($user_id = 0) { $user->aim = wp_specialchars(trim($_POST['aim'])); if (isset ($_POST['yim'])) $user->yim = wp_specialchars(trim($_POST['yim'])); - if (isset ($_POST['flickr_username'])) - $user->flickr_username = wp_specialchars(trim($_POST['flickr_username'])); $errors = array (); @@ -397,7 +393,7 @@ function edit_user($user_id = 0) { if (!empty ($pass1)) $user->user_pass = $pass1; - if (!$update && username_exists($user_login)) + if (!$update && username_exists($user->user_login)) $errors['user_login'] = __('ERROR: This username is already registered, please choose another one.'); /* checking e-mail address */ -- cgit