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:57 +0200 |
| commit | 64ce35e2a94e1530648ad311c5c43a41c650340f (patch) | |
| tree | bc2e4197102e9f776b21b20a788cb448838aeca7 | |
| parent | db2c1a53cbd6ba073f5c4a8f925a95a72f0f6981 (diff) | |
Fix bug where non-existing (or unsubscribed) folder wasn't listed in folder selector (#1489956)
| -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 29b359d7f..25ae9de23 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 4ec64a549..a93e389b9 100644 --- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php +++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php @@ -1827,17 +1827,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>'; |