Merge with WordPress 2.3.1

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1139 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 14 insertions, 5 deletions

diff --git a/wp-includes/registration.php b/wp-includes/registration.php
index c535983..c5b0fb1 100644
--- a/wp-includes/registration.php
+++ b/wp-includes/registration.php
@@ -21,7 +21,8 @@ function username_exists( $username ) {
  */
 function email_exists( $email ) {
 	global $wpdb;
-	return $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->users WHERE user_email = %s", $email) );
+	$email = $wpdb->escape( $email );
+	return $wpdb->get_var( "SELECT ID FROM $wpdb->users WHERE user_email = '$email'" );
 }
 
 /**
@@ -97,13 +98,18 @@ function wp_insert_user($userdata) {
 	if ( empty($user_registered) )
 		$user_registered = gmdate('Y-m-d H:i:s');
 
-	$data = compact( 'user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name' );
-
 	if ( $update ) {
-		$wpdb->update( $wpdb->users, $data, compact( 'ID' ) );
+		$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 = (int) $ID;
 	} else {
-		$wpdb->insert( $wpdb->users, $data + compact( 'user_login' ) );
+		$query = "INSERT INTO $wpdb->users
+		(user_login, user_pass, user_email, user_url, user_registered, user_nicename, display_name)
+	VALUES
+		('$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 = (int) $wpdb->insert_id;
 	}
 
@@ -139,10 +145,13 @@ function wp_insert_user($userdata) {
 
 /**
  * Update an user in the database.
+ * @global object $wpdb WordPress database layer.
  * @param array $userdata An array of user data.
  * @return int The updated user's ID.
  */
 function wp_update_user($userdata) {
+	global $wpdb;
+
 	$ID = (int) $userdata['ID'];
 
 	// First, get all of the original fields