WP Merge

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

1 files changed, 5 insertions, 2 deletions

diff --git a/wp-inst/wp-admin/admin-functions.php b/wp-inst/wp-admin/admin-functions.php
index 6fc0ec3..e6fc59c 100644
--- a/wp-inst/wp-admin/admin-functions.php
+++ b/wp-inst/wp-admin/admin-functions.php
@@ -329,13 +329,13 @@ function add_user() {
 }
 
 function edit_user($user_id = 0) {
-	global $current_user, $wp_roles;
+	global $current_user, $wp_roles, $wpdb;
 
 	if ($user_id != 0) {
 		$update = true;
 		$user->ID = $user_id;
 		$userdata = get_userdata($user_id);
-		$user->user_login = $userdata->user_login;
+		$user->user_login = $wpdb->escape($userdata->user_login);
 	} else {
 		$update = false;
 		$user = '';
@@ -406,6 +406,9 @@ function edit_user($user_id = 0) {
 	if (!empty ($pass1))
 		$user->user_pass = $pass1;
 
+	if ( !validate_username($user->user_login) )
+		$errors['user_login'] = __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.');
+
 	if (!$update && username_exists($user->user_login))
 		$errors['user_login'] = __('<strong>ERROR</strong>: This username is already registered, please choose another one.');