diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2012-12-14 14:21:32 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2012-12-14 14:21:32 -0200 |
| commit | f9ca24a9407f294a9bb7305180f9f8e740ab6ec9 (patch) | |
| tree | 4c9a263b7fd770151e40940d6ddaa89d27e5053d /actions/register.php | |
| parent | e15f0fce6940ee999cf5d6405ad1b16d00c38e4b (diff) | |
| parent | 3ed289b03fa3d851fd7fffbc0441ebc9b5e98310 (diff) | |
| download | elgg-f9ca24a9407f294a9bb7305180f9f8e740ab6ec9.tar.gz elgg-f9ca24a9407f294a9bb7305180f9f8e740ab6ec9.tar.bz2 | |
Merge branch 'master' of git://gitorious.org/lorea/elgg into saravea
Diffstat (limited to 'actions/register.php')
| -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); |