diff options
| author | Aleksander Machniak <alec@alec.pl> | 2022-08-23 20:46:39 +0300 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2022-08-23 20:48:37 +0300 |
| commit | e167e4dac38c7db1d897c0d66fa27c5e6fd8da2d (patch) | |
| tree | 116f2664a515b01fb150696edd9efa0e231f5db6 | |
| parent | 193a13666948fac19e390dd66cecf4fc39f53b08 (diff) | |
Fix bug where setting 'Clear Trash on Logout' to 'all messages' didn't work (#8687)
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | program/actions/settings/index.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index eb81d8e52..a9854b398 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Fix bug where it wasn't possible to create more than one response record on SQLite and Postgres (#8664) - Fix support for ManageSieve over implicit SSL (#8670) - Fix bug where "about:blank" page could trigger "load error" (#8554) +- Fix bug where setting 'Clear Trash on Logout' to 'all messages' didn't work (#8687) ## Release 1.6.0 diff --git a/program/actions/settings/index.php b/program/actions/settings/index.php index 47c88ac56..fdc3471da 100644 --- a/program/actions/settings/index.php +++ b/program/actions/settings/index.php @@ -1429,14 +1429,14 @@ class rcmail_action_settings_index extends rcmail_action $select->add($rcmail->gettext(['name' => 'olderxdays', 'vars' => ['x' => $days]]), (string) $days); } - $purge = (string) $config['logout_purge']; + $purge = $config['logout_purge']; if (!is_numeric($purge)) { $purge = empty($purge) ? 'never' : 'all'; } $blocks['maintenance']['options']['logout_purge'] = [ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('logoutclear'))), - 'content' => $select->show($purge), + 'content' => $select->show((string) $purge), ]; } |