From 36ef345eb6425106f061fb866d9fa66d051e16df Mon Sep 17 00:00:00 2001 From: brettp Date: Mon, 5 Apr 2010 16:08:42 +0000 Subject: Merged 5530:5604 from 1.7 to trunk. git-svn-id: http://code.elgg.org/elgg/trunk@5622 36083f99-b078-4883-b0ff-0f9b5a30f544 --- actions/register.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actions/register.php') diff --git a/actions/register.php b/actions/register.php index c515d27ee..efbc3def3 100644 --- a/actions/register.php +++ b/actions/register.php @@ -33,7 +33,7 @@ if (!$CONFIG->disable_registration) { if (($guid) && ($admin)) { // Only admins can make someone an admin admin_gatekeeper(); - $new_user->admin = 'yes'; + $new_user->makeAdmin(); } // Send user validation request on register only @@ -42,7 +42,7 @@ if (!$CONFIG->disable_registration) { request_user_validation($guid); } - if (!$new_user->admin) { + if (!$new_user->isAdmin()) { // Now disable if not an admin // Don't do a recursive disable. Any entities owned by the user at this point // are products of plugins that hook into create user and might need -- cgit v1.2.3