Rename image-uploading to inline-uploading. Props skeltoac. fixes #1834
git-svn-id: http://svn.automattic.com/wordpress/trunk@2994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
@@ -53,15 +53,12 @@ function wp_insert_user($userdata) {
|
||||
clean_user_cache($user_login);
|
||||
|
||||
update_usermeta( $user_id, 'first_name', $first_name);
|
||||
update_usermeta( $user_id, 'middle_name', $middle_name);
|
||||
update_usermeta( $user_id, 'last_name', $last_name);
|
||||
update_usermeta( $user_id, 'nickname', $nickname );
|
||||
update_usermeta( $user_id, 'description', $description );
|
||||
update_usermeta( $user_id, 'jabber', $jabber );
|
||||
update_usermeta( $user_id, 'aim', $aim );
|
||||
update_usermeta( $user_id, 'yim', $yim );
|
||||
update_usermeta( $user_id, 'flickr_username', $flickr_username );
|
||||
|
||||
|
||||
if ( !$update ) {
|
||||
$user = new WP_User($user_id);
|
||||
@@ -92,7 +89,7 @@ function wp_update_user($userdata) {
|
||||
$plaintext_pass = $userdata['user_pass'];
|
||||
$userdata['user_pass'] = md5($userdata['user_pass']);
|
||||
}
|
||||
|
||||
|
||||
// Merge old and new fields with new fields overwriting old ones.
|
||||
$userdata = array_merge($user, $userdata);
|
||||
$user_id = wp_insert_user($userdata);
|
||||
@@ -125,4 +122,4 @@ function create_user( $username, $password, $email ) {
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user