aboutsummaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorSteve Clay <steve@mrclay.org>2012-11-13 20:18:42 -0800
committerSteve Clay <steve@mrclay.org>2012-11-13 20:18:42 -0800
commit667c0da0290b2c1fee3854f93e8caa77584c3c5f (patch)
tree8dd8445583727f8dd9b8136c5d8c734332125a28 /actions
parent6623571b615fc5c9d1b82e2607de4cdaee8a818b (diff)
parente40468a7aff9a445a5352b509044cb6a3597a341 (diff)
downloadelgg-667c0da0290b2c1fee3854f93e8caa77584c3c5f.tar.gz
elgg-667c0da0290b2c1fee3854f93e8caa77584c3c5f.tar.bz2
Merge pull request #429 from sembrestels/register-sticky
Fixes #4911. Cleaning register form after last check.
Diffstat (limited to 'actions')
-rw-r--r--actions/register.php5
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);