aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-02-22 18:57:36 +0100
committerAndreas Fischer <bantu@phpbb.com>2015-02-22 18:57:36 +0100
commit71eb981a818e8f28f7087ce74eed87daebe9762b (patch)
treec2d3bbed15981224808734820745bc2065a57e53
parent677337348f8b0f3182b9edda94d8c134f66e39bc (diff)
parentd152bbc7271b573fd07ce2cf65ab056fed5f4847 (diff)
downloadforums-71eb981a818e8f28f7087ce74eed87daebe9762b.tar
forums-71eb981a818e8f28f7087ce74eed87daebe9762b.tar.gz
forums-71eb981a818e8f28f7087ce74eed87daebe9762b.tar.bz2
forums-71eb981a818e8f28f7087ce74eed87daebe9762b.tar.xz
forums-71eb981a818e8f28f7087ce74eed87daebe9762b.zip
Merge branch '3.1.x'
* 3.1.x: [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
-rw-r--r--phpBB/phpbb/auth/provider/ldap.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php
index d32e7504eb..c71950c698 100644
--- a/phpBB/phpbb/auth/provider/ldap.php
+++ b/phpBB/phpbb/auth/provider/ldap.php
@@ -306,7 +306,7 @@ class ldap extends \phpbb\auth\provider\base
return array(
'TEMPLATE_FILE' => 'auth_provider_ldap.html',
'TEMPLATE_VARS' => array(
- 'AUTH_LDAP_DN' => $new_config['ldap_base_dn'],
+ 'AUTH_LDAP_BASE_DN' => $new_config['ldap_base_dn'],
'AUTH_LDAP_EMAIL' => $new_config['ldap_email'],
'AUTH_LDAP_PASSORD' => $new_config['ldap_password'],
'AUTH_LDAP_PORT' => $new_config['ldap_port'],