From 86abb9cc145f68c7b4be9126508e36e02d69644e Mon Sep 17 00:00:00 2001 From: Damien Regad Date: Fri, 17 Aug 2012 11:49:13 +0200 Subject: [PATCH] Do not skip e-mail validation if $g_login_method != LDAP Prior to this, function email_is_valid() always returned true when $g_use_ldap_email = ON, even if $g_login_method != LDAP. Even though this is not an usual case (when not using LDAP, the other LDAP-related configuration options should be left to their default values), this causes the actual validation to be skipped which could lead to email sending errors. Fixes #14632 --- core/email_api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/email_api.php b/core/email_api.php index 6f8e1c0b98..6e33fc3761 100644 --- a/core/email_api.php +++ b/core/email_api.php @@ -113,7 +113,7 @@ function email_is_valid( $p_email ) { return true; } - if ( ON == config_get( 'use_ldap_email' ) ) { + if ( LDAP == config_get( 'login_method' ) && ON == config_get( 'use_ldap_email' ) ) { return true; }