summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-admin/admin-functions.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-11-21 09:24:59 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-11-21 09:24:59 +0000
commitca9480281cb3cb331788f8475b1e080bff59ec8d (patch)
tree03c3457f2c0be80543aec170ff2781087b532b62 /wp-inst/wp-admin/admin-functions.php
parentefcb857423cc3556d2283152cc1de82f6c56cc74 (diff)
downloadwordpress-mu-ca9480281cb3cb331788f8475b1e080bff59ec8d.tar.gz
wordpress-mu-ca9480281cb3cb331788f8475b1e080bff59ec8d.tar.xz
wordpress-mu-ca9480281cb3cb331788f8475b1e080bff59ec8d.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@442 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-admin/admin-functions.php')
-rw-r--r--wp-inst/wp-admin/admin-functions.php6
1 files changed, 1 insertions, 5 deletions
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'] = __('<strong>ERROR</strong>: This username is already registered, please choose another one.');
/* checking e-mail address */