summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-02-13 17:33:25 +0000
committeralecpl <alec@alec.pl>2010-02-13 17:33:25 +0000
commit48bc52e835bd5485f7443d54399e4fb0d36732d7 (patch)
tree52a6be2f0aa273a9d0ea24c0b38c969147161671 /program/steps/mail
parent9194996a28b6c8a45905e48ed937cc8e2aa5b92e (diff)
- Fix imap_init hook broken in r3258 (#1486493)
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/func.inc5
1 files changed, 1 insertions, 4 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 73919d3aa..f522d0dc3 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -24,9 +24,6 @@ $EMAIL_ADDRESS_PATTERN = '([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9][a-z0-9\-\.]*\\.[a-
// actions that do not require imap connection
$NOIMAP_ACTIONS = array('spell', 'addcontact', 'autocomplete', 'upload', 'display-attachment', 'remove-attachment');
-// Init IMAP object
-$RCMAIL->imap_init();
-
// log in to imap server
if (!in_array($RCMAIL->action, $NOIMAP_ACTIONS) && !$RCMAIL->imap_connect()) {
$RCMAIL->kill_session();
@@ -42,7 +39,7 @@ if (!in_array($RCMAIL->action, $NOIMAP_ACTIONS) && !$RCMAIL->imap_connect()) {
// set imap properties and session vars
if ($mbox = get_input_value('_mbox', RCUBE_INPUT_GPC))
$IMAP->set_mailbox(($_SESSION['mbox'] = $mbox));
-else
+else if ($IMAP)
$_SESSION['mbox'] = $IMAP->get_mailbox_name();
if (!empty($_GET['_page']))