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/acp/acp_board.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/acp/acp_board.php')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index ff3b50174b..018eedda2a 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -501,7 +501,7 @@ class acp_board } // We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to... - foreach ($display_vars['vars'] as $config_name => $null) + foreach ($display_vars['vars'] as $config_name => $data) { if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false) { @@ -533,6 +533,13 @@ class acp_board if ($submit) { + if (strpos($data['type'], 'password') === 0 && $config_value === '********') + { + // Do not update password fields if the content is ********, + // because that is the password replacement we use to not + // send the password to the output + continue; + } $config->set($config_name, $config_value); if ($config_name == 'allow_quick_reply' && isset($_POST['allow_quick_reply_enable'])) @@ -562,6 +569,7 @@ class acp_board $old_auth_config = array(); foreach ($auth_providers as $provider) { + /** @var \phpbb\auth\provider\provider_interface $provider */ if ($fields = $provider->acp()) { // Check if we need to create config fields for this plugin and save config when submit was pressed @@ -577,6 +585,14 @@ class acp_board continue; } + if (substr($field, -9) === '_password' && $cfg_array[$field] === '********') + { + // Do not update password fields if the content is ********, + // because that is the password replacement we use to not + // send the password to the output + continue; + } + $old_auth_config[$field] = $this->new_config[$field]; $config_value = $cfg_array[$field]; $this->new_config[$field] = $config_value; |