diff options
author | Sem <sembrestels@riseup.net> | 2012-12-07 23:55:12 +0100 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2012-12-07 23:55:12 +0100 |
commit | 3ed289b03fa3d851fd7fffbc0441ebc9b5e98310 (patch) | |
tree | b2c8d2d7f569f0e3e7bfa6711cef96f806aea9f1 /actions | |
parent | 2b2af5392f0daadc22a1db04aa17c17d4dd37c65 (diff) | |
parent | ccf7abb4b2b94781f9b67a6cf8798994aa1cca0d (diff) | |
download | elgg-3ed289b03fa3d851fd7fffbc0441ebc9b5e98310.tar.gz elgg-3ed289b03fa3d851fd7fffbc0441ebc9b5e98310.tar.bz2 |
Merge tag '1.8.11' of git://github.com/Elgg/Elgg
Elgg 1.8.11 release
Diffstat (limited to 'actions')
-rw-r--r-- | actions/register.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actions/register.php b/actions/register.php index f23d5b381..810ceaf27 100644 --- a/actions/register.php +++ b/actions/register.php @@ -30,8 +30,6 @@ if (elgg_get_config('allow_registration')) { $guid = register_user($username, $password, $name, $email, false, $friend_guid, $invitecode); if ($guid) { - elgg_clear_sticky_form('register'); - $new_user = get_entity($guid); // allow plugins to respond to self registration @@ -54,6 +52,7 @@ if (elgg_get_config('allow_registration')) { throw new RegistrationException(elgg_echo('registerbad')); } + elgg_clear_sticky_form('register'); system_message(elgg_echo("registerok", array(elgg_get_site_entity()->name))); // if exception thrown, this probably means there is a validation @@ -76,4 +75,4 @@ if (elgg_get_config('allow_registration')) { register_error(elgg_echo('registerdisabled')); } -forward(REFERER);
\ No newline at end of file +forward(REFERER); |