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/includes/functions_acp.php | |
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/includes/functions_acp.php')
-rw-r--r-- | phpBB/includes/functions_acp.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 6d59b513af..eea18a0c47 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -245,8 +245,13 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) switch ($tpl_type[0]) { - case 'text': case 'password': + if ($new[$config_key] !== '') + { + // replace passwords with asterixes + $new[$config_key] = '********'; + } + case 'text': case 'url': case 'email': case 'color': |