Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2019-12-23 10:35:15 +01:00
commit e87635a209
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -530,13 +530,16 @@ class acp_board
if ($submit) if ($submit)
{ {
if (strpos($data['type'], 'password') === 0 && $config_value === '********') if (isset($data['type']) && 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 * Do not update password fields if the content is ********,
// send the password to the output * because that is the password replacement we use to not
* send the password to the output
*/
continue; continue;
} }
$config->set($config_name, $config_value); $config->set($config_name, $config_value);
if ($config_name == 'allow_quick_reply' && isset($_POST['allow_quick_reply_enable'])) if ($config_name == 'allow_quick_reply' && isset($_POST['allow_quick_reply_enable']))