aboutsummaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-13 18:06:07 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-13 18:06:07 +0000
commit0b6489397a8f5a01c28e61d07548e99ef3e4ff6a (patch)
treefcce8e6e2390169727a80ded32d754b15dd468f7 /actions
parentfa67f02d3979211ad1553d7901d2cc104b0b0539 (diff)
downloadelgg-0b6489397a8f5a01c28e61d07548e99ef3e4ff6a.tar.gz
elgg-0b6489397a8f5a01c28e61d07548e99ef3e4ff6a.tar.bz2
Reverted changes so users can now register again.
There are critical issues with enable/disable. Primarily: 1) A number of functions do not use the access controls, these throw an exception when accessing a disabled entity. 2) #243 does not seem possible. git-svn-id: https://code.elgg.org/elgg/trunk@1909 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'actions')
-rw-r--r--actions/email/confirm.php2
-rw-r--r--actions/register.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/actions/email/confirm.php b/actions/email/confirm.php
index 39eb68908..d8597c880 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 059e69f50..e54de28fe 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -51,7 +51,7 @@
request_email_validation($guid);
// Now disable
- $new_user->disable('new_user');
+ //$new_user->disable('new_user');
system_message(sprintf(elgg_echo("registerok"),$CONFIG->sitename));