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

2 files changed, 2 insertions, 2 deletions

diff --git a/roundcubemail/plugins/managesieve/managesieve.php b/roundcubemail/plugins/managesieve/managesieve.php
index 07b39767d..219c33489 100644
--- a/roundcubemail/plugins/managesieve/managesieve.php
+++ b/roundcubemail/plugins/managesieve/managesieve.php
@@ -901,7 +901,7 @@ class managesieve extends rcube_plugin
     $out .= '<select id="action_mailbox' .$id. '" name="_action_mailbox[]" style="display:' 
 	.(!isset($action) || $action['type']=='fileinto' ? 'inline' : 'none'). '">';
 
-    $this->rc->imap_init(true);
+    $this->rc->imap_connect();
 
     $a_folders = $this->rc->imap->list_mailboxes();
     $delimiter = $this->rc->imap->get_hierarchy_delimiter();
diff --git a/roundcubemail/plugins/subscriptions_option/subscriptions_option.php b/roundcubemail/plugins/subscriptions_option/subscriptions_option.php
index ecbc4e238..4d471b8e6 100644
--- a/roundcubemail/plugins/subscriptions_option/subscriptions_option.php
+++ b/roundcubemail/plugins/subscriptions_option/subscriptions_option.php
@@ -65,7 +65,7 @@ class subscriptions_option extends rcube_plugin
             // if the use_subscriptions preference changes, flush the folder cache
             if (($use_subscriptions && !isset($_POST['_use_subscriptions'])) ||
                 (!$use_subscriptions && isset($_POST['_use_subscriptions']))) {
-                    $rcmail->imap_init(true);
+                    $rcmail->imap_connect();
                     $rcmail->imap->clear_cache('mailboxes');
             }
         }