Continued with ext-blacklist:

[mailer.git] / inc / modules / member / what-mydata.php

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 9b5d43178883bf33eab428f449fe9db1e4d5864f..270d746505598f81015eef939c8a6e350de12fe5 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -224,7 +224,7 @@ LIMIT 1',
                } elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) {
                        // Invalid email address!
                        displayMessage('{--INVALID_EMAIL_ENTERED--}');
-               } elseif ((isEmailTaken(postRequestElement('email'))) && (isCheckDoubleEmailEnabled()) && (!isAdmin())) {
+               } elseif ((isExtensionInstalledAndNewer('other', '0.3.0')) && (isCheckDoubleEmailEnabled()) && (!isAdmin()) && (isEmailTaken(postRequestElement('email')))) {
                        // Email address is already registered
                        displayMessage('{--MEMBER_EMAIL_IS_ALREADY_REGISTERED--}');
                } else {
@@ -246,15 +246,17 @@ LIMIT 1',
                                if (postRequestElement('email') != $content['email']) {
                                        // Yes, but is it maybe blacklisted?
                                        $filterData = array(
-                                               'init_done' => TRUE,
-                                               'post_data' => postRequestArray()
+                                               'init_done'   => TRUE,
+                                               'post_data'   => postRequestArray(),
+                                               'blacklisted' => '',
+                                               'message'     => '{--PRE_UPDATE_USER_DATA_FAILED--}',
                                        );
                                        $filterData = runFilterChain('pre_update_user_data', $filterData);
 
                                        // Is it blacklisted?
                                        if ($filterData['init_done'] === FALSE) {
-                                               // Blacklisted email address found
-                                               displayMessage('{--MEMBER_EMAIL_BLACKLISTED--}');
+                                               // Found something blacklisted
+                                               displayMessage($filterData['message']);
                                                return;
                                        } // END - if