diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-06-07 14:59:33 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-06-07 14:59:33 +0200 |
| commit | 77bc8ee68bea99a7cd8cd6cfacb1c6292e58d01a (patch) | |
| tree | 267ca83c2c796b50b932bd88c3cad275422c681f /phpBB/phpbb/auth | |
| parent | 1f772234f7bdafe13593f2623f989909b469d141 (diff) | |
| parent | bac02a348ee765dd7000108a0933ed03561aaecc (diff) | |
| download | forums-77bc8ee68bea99a7cd8cd6cfacb1c6292e58d01a.tar forums-77bc8ee68bea99a7cd8cd6cfacb1c6292e58d01a.tar.gz forums-77bc8ee68bea99a7cd8cd6cfacb1c6292e58d01a.tar.bz2 forums-77bc8ee68bea99a7cd8cd6cfacb1c6292e58d01a.tar.xz forums-77bc8ee68bea99a7cd8cd6cfacb1c6292e58d01a.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/includes/acp/acp_board.php
phpBB/includes/acp/acp_jabber.php
Diffstat (limited to 'phpBB/phpbb/auth')
| -rw-r--r-- | phpBB/phpbb/auth/provider/ldap.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/phpbb/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php index c71950c698..c48b771ab0 100644 --- a/phpBB/phpbb/auth/provider/ldap.php +++ b/phpBB/phpbb/auth/provider/ldap.php @@ -289,7 +289,6 @@ class ldap extends \phpbb\auth\provider\base /** * {@inheritdoc} */ - public function acp() { // These are fields required in the config table @@ -308,7 +307,7 @@ class ldap extends \phpbb\auth\provider\base 'TEMPLATE_VARS' => array( '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_PASSORD' => $new_config['ldap_password'] !== '' ? '********' : '', 'AUTH_LDAP_PORT' => $new_config['ldap_port'], 'AUTH_LDAP_SERVER' => $new_config['ldap_server'], 'AUTH_LDAP_UID' => $new_config['ldap_uid'], |