Imported Upstream version 0.7

[roundcube.git] / program / steps / settings / folders.inc

diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
index 69339e29a3a09ee5f9fb2f1f275070402bcfc9fe..2cc863ab109b689a95ef6228771ca56bead115c3 100644 (file)
--- a/program/steps/settings/folders.inc
+++ b/program/steps/settings/folders.inc
@@ -16,7 +16,7 @@
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 
- $Id: folders.inc 5091 2011-08-18 18:34:56Z thomasb $
+ $Id: folders.inc 5402 2011-11-09 10:03:54Z alec $
 
 */
 
@@ -203,7 +203,7 @@ function rcube_subscription_form($attrib)
     $IMAP->clear_cache('mailboxes', true);
 
     $a_unsubscribed = $IMAP->list_unsubscribed();
-    $a_subscribed   = $IMAP->list_mailboxes();
+    $a_subscribed   = $IMAP->list_mailboxes('', '*', null, null, true); // unsorted
     $delimiter      = $IMAP->get_hierarchy_delimiter();
     $namespace      = $IMAP->get_namespace();
     $a_js_folders   = array();
@@ -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);