summaryrefslogtreecommitdiff
path: root/roundcubemail/program/steps/settings
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-02-21 16:44:39 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-02-21 16:44:39 +0000
commit9989376b95d55ed752b2e3f6e8dbf42257f5ce77 (patch)
treea9f5c8bce703932d57782d28bd9a3799ba257ab4 /roundcubemail/program/steps/settings
parentd91a62c9ec99c3a33fe135e73da1cdce0c33ec09 (diff)
Use rcmail::imap_connect() to establish IMAP connections; always initialize rcube_imap object in mail steps
git-svn-id: https://svn.roundcube.net/trunk@3278 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/settings')
-rw-r--r--roundcubemail/program/steps/settings/func.inc2
-rw-r--r--roundcubemail/program/steps/settings/manage_folders.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc
index a2175b0f0..094fa5995 100644
--- a/roundcubemail/program/steps/settings/func.inc
+++ b/roundcubemail/program/steps/settings/func.inc
@@ -509,7 +509,7 @@ function rcmail_user_prefs($current=null)
// Configure special folders
if (!isset($no_override['default_imap_folders'])) {
- $RCMAIL->imap_init(true);
+ $RCMAIL->imap_connect();
$select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true,
'maxlength' => 30, 'exceptions' => array('INBOX')));
diff --git a/roundcubemail/program/steps/settings/manage_folders.inc b/roundcubemail/program/steps/settings/manage_folders.inc
index 22bd158f5..06fee7a87 100644
--- a/roundcubemail/program/steps/settings/manage_folders.inc
+++ b/roundcubemail/program/steps/settings/manage_folders.inc
@@ -22,7 +22,7 @@
// WARNING: folder names in UI are encoded with RCMAIL_CHARSET
// init IMAP connection
-$RCMAIL->imap_init(true);
+$RCMAIL->imap_connect();
// subscribe to one or more mailboxes
if ($RCMAIL->action=='subscribe')