Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…

…evelop
nagyist · Jun 20, 2014 · 14918c3 · 14918c3
2 parents 9706e23 + 69c518a
commit 14918c3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
@@ -55,7 +55,7 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
 	$login='';
 	$resultFetchUser='';
 
-	if (! empty($_POST["username"]))
+	if (!empty($_POST["username"]) || $usertotest)
 	{
 		// If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko
 		$ldaphost=$dolibarr_main_auth_ldap_host;
@@ -228,4 +228,4 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
 }
 
 
-?>
+?>