From 91b1bc93352e5cfedbf9e1866d140f0ef2b29e4c Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 6 Oct 2010 14:35:29 +0000
Subject: 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
---
 mod/uservalidationbyemail/actions/validate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/uservalidationbyemail/actions/validate.php')

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;
 	}
-- 
cgit v1.2.3