diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/email/confirm.php | 2 | ||||
| -rw-r--r-- | actions/register.php | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/actions/email/confirm.php b/actions/email/confirm.php index d8597c880..39eb68908 100644 --- a/actions/email/confirm.php +++ b/actions/email/confirm.php @@ -29,7 +29,7 @@ system_message(elgg_echo('email:confirm:success')); $user = get_entity($user_guid); - //$user->enable(); + $user->enable(); notify_user($user_guid, $CONFIG->site->guid, sprintf(elgg_echo('email:validate:success:subject'), $user->username), sprintf(elgg_echo('email:validate:success:body'), $user->name), NULL, 'email'); diff --git a/actions/register.php b/actions/register.php index e54de28fe..84cca17ac 100644 --- a/actions/register.php +++ b/actions/register.php @@ -47,11 +47,12 @@ $new_user->admin = 'yes'; } + if (!$new_user->admin) + $new_user->disable('new_user'); // Now disable if not an admin + // Send email validation on register only request_email_validation($guid); - // Now disable - //$new_user->disable('new_user'); system_message(sprintf(elgg_echo("registerok"),$CONFIG->sitename)); |