diff options
| author | Sem <sembrestels@riseup.net> | 2012-12-05 00:24:20 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-12-05 00:24:20 +0100 |
| commit | 306c043a720bc51070652366ef929bc612f0bcbb (patch) | |
| tree | a13c704e9c0d8a11387325f010763caaea31b47e | |
| parent | 2b2af5392f0daadc22a1db04aa17c17d4dd37c65 (diff) | |
| parent | e40468a7aff9a445a5352b509044cb6a3597a341 (diff) | |
| download | elgg-306c043a720bc51070652366ef929bc612f0bcbb.tar.gz elgg-306c043a720bc51070652366ef929bc612f0bcbb.tar.bz2 | |
Merge branch 'register-sticky' of git://github.com/sembrestels/Elgg into foxglove-1
| -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); |