aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-12-17 08:11:36 -0500
committerCash Costello <cash.costello@gmail.com>2011-12-17 08:11:36 -0500
commit53e6eb8ad8c71ed04e33b32024e3e2ea4e6e2c18 (patch)
tree033db60205c51aeb79944953389705af4cb469a2
parentf8a2f8e5b9ae26781ec317391948266433cd7669 (diff)
downloadelgg-53e6eb8ad8c71ed04e33b32024e3e2ea4e6e2c18.tar.gz
elgg-53e6eb8ad8c71ed04e33b32024e3e2ea4e6e2c18.tar.bz2
Fixes #4217 user validation by email now respects decisions by other plugins
-rw-r--r--mod/uservalidationbyemail/start.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
index 576e12247..ea59a2e7b 100644
--- a/mod/uservalidationbyemail/start.php
+++ b/mod/uservalidationbyemail/start.php
@@ -75,6 +75,11 @@ function uservalidationbyemail_disable_new_user($hook, $type, $value, $params) {
return $value;
}
+ // has the user already been validated?
+ if (elgg_get_user_validation_status($user->guid) == true) {
+ return $value;
+ }
+
// disable user to prevent showing up on the site
// set context so our canEdit() override works
elgg_push_context('uservalidationbyemail_new_user');