diff options
| author | alecpl <alec@alec.pl> | 2011-11-09 10:03:54 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-11-09 10:03:54 +0000 |
| commit | 51f7a5b2a09777d3a279757af620e42985ff9a86 (patch) | |
| tree | 1b4700d4e4f3e5277dcb9877118acc1ee9098b74 /program/steps/settings | |
| parent | 69cb80b0594add4d18f8de6b5c676f1dc4d0a835 (diff) | |
- Apply fixes from trunk up to r5401
Diffstat (limited to 'program/steps/settings')
| -rw-r--r-- | program/steps/settings/edit_folder.inc | 3 | ||||
| -rw-r--r-- | program/steps/settings/folders.inc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc index 36a4b28ba..e9566f7aa 100644 --- a/program/steps/settings/edit_folder.inc +++ b/program/steps/settings/edit_folder.inc @@ -119,7 +119,8 @@ function rcmail_folder_form($attrib) 'realnames' => false, 'maxlength' => 150, 'unsubscribed' => true, - 'exceptions' => array($mbox_imap), + 'skip_noinferiors' => true, + 'exceptions' => array($mbox_imap), )); $form['props']['fieldsets']['location']['content']['path'] = array( diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc index 206f62c60..77cbb5571 100644 --- a/program/steps/settings/folders.inc +++ b/program/steps/settings/folders.inc @@ -283,8 +283,8 @@ function rcube_subscription_form($attrib) } if (!$protected) { - $opts = $IMAP->mailbox_options($folder['id']); - $noselect = in_array('\\Noselect', $opts); + $attrs = $IMAP->mailbox_attributes($folder['id']); + $noselect = in_array('\\Noselect', $attrs); } $disabled = (($protected && $subscribed) || $noselect); |