Merge branch 'master' into BUG-13075/Urlaubstool_Markierung_Folgemonat

application/libraries/LDAPLib.php

@@ -220,7 +220,9 @@ class LDAPLib
 		}
 		else // Connection error
 		{
-			return error(ldap_error($ldapConnection));
+			return error(
+				'An error occurred while connecting to the LDAP server: '.$ldapConfigs[self::SERVER].':'.$ldapConfigs[self::PORT]
+			);
 		}
 	}
 }