diff options
| author | Aleksander Machniak <alec@alec.pl> | 2017-05-26 09:46:59 +0300 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2017-05-26 09:47:29 +0300 |
| commit | bf6440c3dc88d4e532d81c0574b3e07438b71133 (patch) | |
| tree | dec0a79897556b38483fd4719b95749769f2a338 /program/steps | |
| parent | 954a677f12495dc87f32c15c5d647d4427813099 (diff) | |
Fix POST parameter reflection in default_charset selector (#5768)
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/settings/save_prefs.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index ec5504fce..0ddf3c7e5 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -67,6 +67,10 @@ case 'mailview': 'default_charset' => rcube_utils::get_input_value('_default_charset', rcube_utils::INPUT_POST), ); + if ($a_user_prefs['default_charset'] && !preg_match('/^[a-zA-Z0-9-]+$/', $a_user_prefs['default_charset'])) { + $a_user_prefs['default_charset'] = $CONFIG['default_charset']; + } + break; case 'compose': |