diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-02-13 17:33:25 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-02-13 17:33:25 +0000 |
| commit | 06df7153a7794f6b52f58f81f5e955451d99976e (patch) | |
| tree | 406de914b4c0921853d7d40ddfc81e5f0f46824d /roundcubemail/program/steps | |
| parent | 7371eedbe9c13d15eef2aabe4801ec37a549cc0b (diff) | |
- Fix imap_init hook broken in r3258 (#1486493)
git-svn-id: https://svn.roundcube.net/trunk@3268 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps')
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 73919d3aa..f522d0dc3 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/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'])) |