From 9989376b95d55ed752b2e3f6e8dbf42257f5ce77 Mon Sep 17 00:00:00 2001 From: thomasb Date: Sun, 21 Feb 2010 16:44:39 +0000 Subject: 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 --- roundcubemail/program/steps/settings/func.inc | 2 +- roundcubemail/program/steps/settings/manage_folders.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'roundcubemail/program/steps/settings') 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') -- cgit v1.2.3