summaryrefslogtreecommitdiffstats
path: root/wp-includes/registration.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-08-31 14:55:29 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-08-31 14:55:29 +0000
commitb764f60728be1d4e026f9d7ae618ab47e23322f8 (patch)
tree1f1b45c4f1c1cf027b3240f605346e56209be8ff /wp-includes/registration.php
parentdad010666b767a1d06588d1d09c771c62f67c387 (diff)
downloadwordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.tar.gz
wordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.tar.xz
wordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.zip
WP Merge to rev #4147
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@729 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/registration.php')
-rw-r--r--wp-includes/registration.php4
1 files changed, 2 insertions, 2 deletions
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');