mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 00:07:44 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	phpBB/includes/acp/acp_board.php
	phpBB/includes/acp/acp_jabber.php
This commit is contained in:
Marc Alexander
2015-06-07 14:59:33 +02:00
parent 1f772234f7 bac02a348e
commit 77bc8ee68b
4 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/functions_acp.php
View File

@@ -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':