Merge branch '3.1.x'

* 3.1.x:
  [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
This commit is contained in:
Andreas Fischer 2015-02-22 18:57:36 +01:00
commit 71eb981a81

View file

@ -306,7 +306,7 @@ class ldap extends \phpbb\auth\provider\base
return array( return array(
'TEMPLATE_FILE' => 'auth_provider_ldap.html', 'TEMPLATE_FILE' => 'auth_provider_ldap.html',
'TEMPLATE_VARS' => array( '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_EMAIL' => $new_config['ldap_email'],
'AUTH_LDAP_PASSORD' => $new_config['ldap_password'], 'AUTH_LDAP_PASSORD' => $new_config['ldap_password'],
'AUTH_LDAP_PORT' => $new_config['ldap_port'], 'AUTH_LDAP_PORT' => $new_config['ldap_port'],