Wordpress 2.0.11

[autoinstalls/wordpress.git] / wp-includes / registration-functions.php

diff --git a/wp-includes/registration-functions.php b/wp-includes/registration-functions.php
index ff9db3d2267032d2595769426dd399e458004ce2..56a433fd46bcfe36b9af4c835622125603242a7b 100644 (file)
--- a/wp-includes/registration-functions.php
+++ b/wp-includes/registration-functions.php
@@ -27,6 +27,7 @@ function wp_insert_user($userdata) {
 
        // Are we updating or creating?
        if ( !empty($ID) ) {
+               $ID = (int) $ID;
                $update = true;
        } else {
                $update = false;
@@ -35,16 +36,40 @@ function wp_insert_user($userdata) {
        }
        
        $user_login = sanitize_user($user_login, true);
+       $user_login = apply_filters('pre_user_login', $user_login);
 
        if ( empty($user_nicename) )
                $user_nicename = sanitize_title( $user_login );
+       $user_nicename = apply_filters('pre_user_nicename', $user_nicename);
+
+       if ( empty($user_url) )
+               $user_url = '';
+       $user_url = apply_filters('pre_user_url', $user_url);
+
+       if ( empty($user_email) )
+               $user_email = '';
+       $user_email = apply_filters('pre_user_email', $user_email);
 
        if ( empty($display_name) )
                $display_name = $user_login;
-               
+       $display_name = apply_filters('pre_user_display_name', $display_name);
+
        if ( empty($nickname) )
                $nickname = $user_login;
-                       
+       $nickname = apply_filters('pre_user_nickname', $nickname);
+
+       if ( empty($first_name) )
+               $first_name = '';
+       $first_name = apply_filters('pre_user_first_name', $first_name);
+
+       if ( empty($last_name) )
+               $last_name = '';
+       $last_name = apply_filters('pre_user_last_name', $last_name);
+
+       if ( empty($description) )
+               $description = '';
+       $description = apply_filters('pre_user_description', $description);
+
        if ( empty($user_registered) )
                $user_registered = gmdate('Y-m-d H:i:s');
 
@@ -52,7 +77,7 @@ function wp_insert_user($userdata) {
                $query = "UPDATE $wpdb->users SET user_pass='$user_pass', user_email='$user_email', user_url='$user_url', user_nicename = '$user_nicename', display_name = '$display_name' WHERE ID = '$ID'";
                $query = apply_filters('update_user_query', $query);
                $wpdb->query( $query );
-               $user_id = $ID;
+               $user_id = (int) $ID;
        } else {
                $query = "INSERT INTO $wpdb->users 
                (user_login, user_pass, user_email, user_url, user_registered, user_nicename, display_name)
@@ -60,7 +85,7 @@ function wp_insert_user($userdata) {
                ('$user_login', '$user_pass', '$user_email', '$user_url', '$user_registered', '$user_nicename', '$display_name')";
                $query = apply_filters('create_user_query', $query);
                $wpdb->query( $query );
-               $user_id = $wpdb->insert_id;
+               $user_id = (int) $wpdb->insert_id;
        }
        
        update_usermeta( $user_id, 'first_name', $first_name);
@@ -93,7 +118,7 @@ function wp_insert_user($userdata) {
 }
 
 function wp_update_user($userdata) {
-       global $wpdb, $current_user;
+       global $wpdb;
 
        $ID = (int) $userdata['ID'];
        
@@ -114,6 +139,7 @@ function wp_update_user($userdata) {
        $user_id = wp_insert_user($userdata);
 
        // Update the cookies if the password changed.  
+       $current_user = wp_get_current_user();
        if( $current_user->id == $ID ) {
                if ( isset($plaintext_pass) ) {
                        wp_clearcookie();