From b764f60728be1d4e026f9d7ae618ab47e23322f8 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Thu, 31 Aug 2006 14:55:29 +0000
Subject: WP Merge to rev #4147

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@729 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/registration.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'wp-includes/registration.php')

diff --git a/wp-includes/registration.php b/wp-includes/registration.php
index 97797cc..8ec38a4 100644
--- a/wp-includes/registration.php
+++ b/wp-includes/registration.php
@@ -102,14 +102,14 @@ function wp_insert_user($userdata) {
 	update_usermeta( $user_id, 'aim', $aim );
 	update_usermeta( $user_id, 'yim', $yim );
 
-	if ( $update && !empty($role) ) {
+	if ( $update && isset($role) ) {
 		$user = new WP_User($user_id);
 		$user->set_role($role);
 	}
 
 	if ( !$update ) {
 		$user = new WP_User($user_id);
-		$user->set_role(get_settings('default_role'));
+		$user->set_role(get_option('default_role'));
 	}
 
 	wp_cache_delete($user_id, 'users');
-- 
cgit