diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-06-22 12:28:16 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-06-22 12:28:16 +0200 |
| commit | b0aee4eb4205365e19a98729ca467bfec4fbea6f (patch) | |
| tree | 550b824bf88fbaa1ed3791c2bafd744830bb90ca /plugins/managesieve | |
| parent | 07893b3cdd5ed8c4291d6f2928bded1bc5713dc7 (diff) | |
Fix bug where non-existing (or unsubscribed) folder wasn't listed in folder selector (#1489956)
Diffstat (limited to 'plugins/managesieve')
| -rw-r--r-- | plugins/managesieve/Changelog | 1 | ||||
| -rw-r--r-- | plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php | 19 |
2 files changed, 13 insertions, 7 deletions
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog index 37550845f..c55387828 100644 --- a/plugins/managesieve/Changelog +++ b/plugins/managesieve/Changelog @@ -1,3 +1,4 @@ +- Fix bug where non-existing (or unsubscribed) folder wasn't listed in folder selector (#1489956) - Added optional separate interface for out-of-office management (#1488266) - Fix disabled "create filter" action - Fix enotify/notify extension handling diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php index 3e3b9becc..59e116ffb 100644 --- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php +++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php @@ -1828,17 +1828,22 @@ class rcube_sieve_engine $out .= '</div>'; // mailbox select - if ($action['type'] == 'fileinto') + if ($action['type'] == 'fileinto') { $mailbox = $this->mod_mailbox($action['target'], 'out'); - else + // make sure non-existing (or unsubscribed) mailbox is listed (#1489956) + $additional = array($mailbox); + } + else { $mailbox = ''; + } $select = $this->rc->folder_selector(array( - 'realnames' => false, - 'maxlength' => 100, - 'id' => 'action_mailbox' . $id, - 'name' => "_action_mailbox[$id]", - 'style' => 'display:'.(empty($action['type']) || $action['type'] == 'fileinto' ? 'inline' : 'none') + 'realnames' => false, + 'maxlength' => 100, + 'id' => 'action_mailbox' . $id, + 'name' => "_action_mailbox[$id]", + 'style' => 'display:'.(empty($action['type']) || $action['type'] == 'fileinto' ? 'inline' : 'none'), + 'additional' => $additional, )); $out .= $select->show($mailbox); $out .= '</td>'; |