aboutsummaryrefslogtreecommitdiff
path: root/mod/uservalidationbyemail/actions
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-06 14:35:29 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-06 14:35:29 +0000
commit91b1bc93352e5cfedbf9e1866d140f0ef2b29e4c (patch)
treea5301989dbec32c9b24e05bccc9a15cf23d1d75a /mod/uservalidationbyemail/actions
parent6606581f431f52330b8bcc28e1aa1b55a4b5b408 (diff)
downloadelgg-91b1bc93352e5cfedbf9e1866d140f0ef2b29e4c.tar.gz
elgg-91b1bc93352e5cfedbf9e1866d140f0ef2b29e4c.tar.bz2
Merged some fixes from the 1.7.4 backport of uservalidationbyemail.
git-svn-id: http://code.elgg.org/elgg/trunk@7023 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/uservalidationbyemail/actions')
-rw-r--r--mod/uservalidationbyemail/actions/validate.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/uservalidationbyemail/actions/validate.php b/mod/uservalidationbyemail/actions/validate.php
index c50053dce..cc4554722 100644
--- a/mod/uservalidationbyemail/actions/validate.php
+++ b/mod/uservalidationbyemail/actions/validate.php
@@ -28,7 +28,7 @@ foreach ($user_guids as $guid) {
$is_validated = uservalidationbyemail_get_user_validation_status($guid);
$validate_success = uservalidationbyemail_set_user_validation_status($guid, TRUE);
- if (!$is_validated || !$validate_success || !$user->enable()) {
+ if ($is_validated || !($validate_success && $user->enable())) {
$error = TRUE;
continue;
}