From fa4cd20fb14c087c80e6a9cde11df17d46e07566 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 04 Aug 2006 08:10:34 -0400
Subject: [PATCH] Several bugfixes; see CHANGELOG for details

---
 program/include/main.inc |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/program/include/main.inc b/program/include/main.inc
index 48e485c..efac8b2 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -205,9 +205,6 @@
   if ($CONFIG['enable_caching']===TRUE)
     $IMAP->set_caching(TRUE);
 
-  if (is_array($CONFIG['default_imap_folders']))
-    $IMAP->set_default_mailboxes($CONFIG['default_imap_folders']);
-
   // set pagesize from config
   if (isset($CONFIG['pagesize']))
     $IMAP->set_pagesize($CONFIG['pagesize']);
@@ -223,6 +220,9 @@
   // set root dir from config
   if (!empty($CONFIG['imap_root']))
     $IMAP->set_rootdir($CONFIG['imap_root']);
+
+  if (is_array($CONFIG['default_imap_folders']))
+    $IMAP->set_default_mailboxes($CONFIG['default_imap_folders']);
 
   if (!empty($_SESSION['mbox']))
     $IMAP->set_mailbox($_SESSION['mbox']);
@@ -510,8 +510,10 @@
     $_SESSION['user_lang'] = $sess_user_lang;
     $_SESSION['password']  = encrypt_passwd($pass);
 
-    // force reloading complete list of subscribed mailboxes    
+    // force reloading complete list of subscribed mailboxes
+    rcmail_set_imap_prop();
     $IMAP->clear_cache('mailboxes');
+    $IMAP->create_default_folders();
 
     return TRUE;
     }

--
Gitblit v1.9.1