diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-05-30 14:19:58 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-30 14:19:58 +0200 |
| commit | b7afeadd6d213a7a300c38d2a0927d0f4623096f (patch) | |
| tree | 8a0d9b5f1784565b37251d91639b4c92607a9703 /phpBB | |
| parent | 26c2efc083e7a32b2b7f1d517051ba521bd82472 (diff) | |
| parent | 327f9afbc0e015864c64b29b412e03142f40ca16 (diff) | |
| download | forums-b7afeadd6d213a7a300c38d2a0927d0f4623096f.tar forums-b7afeadd6d213a7a300c38d2a0927d0f4623096f.tar.gz forums-b7afeadd6d213a7a300c38d2a0927d0f4623096f.tar.bz2 forums-b7afeadd6d213a7a300c38d2a0927d0f4623096f.tar.xz forums-b7afeadd6d213a7a300c38d2a0927d0f4623096f.zip | |
Merge branch 'ticket/bantu/8792' into develop-olympus
* ticket/bantu/8792:
[ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/auth/auth_ldap.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php index a6092baba5..e8c957aaa3 100644 --- a/phpBB/includes/auth/auth_ldap.php +++ b/phpBB/includes/auth/auth_ldap.php @@ -74,7 +74,7 @@ function init_ldap() if ($search === false) { - return $user->lang['LDAP_NO_SERVER_CONNECTION']; + return $user->lang['LDAP_SEARCH_FAILED']; } $result = @ldap_get_entries($ldap, $search); diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index a3d47b5b59..325a20bf02 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -295,6 +295,7 @@ $lang = array_merge($lang, array( 'LAST_VISIT' => 'Last visit', 'LDAP_NO_LDAP_EXTENSION' => 'LDAP extension not available.', 'LDAP_NO_SERVER_CONNECTION' => 'Could not connect to LDAP server.', + 'LDAP_SEARCH_FAILED' => 'An error occured while searching the LDAP directory.', 'LEGEND' => 'Legend', 'LOCATION' => 'Location', 'LOCK_POST' => 'Lock post', |