From c984e1d5625bfab090a33b4db09c145d0ec25d9a Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 23 Jun 2009 22:28:53 -0600 Subject: [PATCH] Do this check earlier. --- imp/message.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/imp/message.php b/imp/message.php index bd39cacd3..c552d087b 100644 --- a/imp/message.php +++ b/imp/message.php @@ -198,6 +198,15 @@ $index_array = $imp_mailbox->getIMAPIndex(); $index = $index_array['index']; $mailbox_name = $index_array['mailbox']; +/* Parse the message. */ +try { + $imp_contents = &IMP_Contents::singleton($index . IMP::IDX_SEP . $mailbox_name); +} catch (Horde_Exception $e) { + _returnToMailbox(null, 'message_missing'); + require IMP_BASE . '/mailbox.php'; + exit; +} + /* Get envelope/flag/header information. */ try { /* Need to fetch flags before HEADERTEXT, because SEEN flag might be set @@ -219,15 +228,6 @@ $flags = $flags_ret[$index]['flags']; $mime_headers = reset($fetch_ret[$index]['headertext']); $use_pop = ($_SESSION['imp']['protocol'] == 'pop'); -/* Parse the message. */ -try { - $imp_contents = &IMP_Contents::singleton($index . IMP::IDX_SEP . $mailbox_name); -} catch (Horde_Exception $e) { - _returnToMailbox(null, 'message_missing'); - require IMP_BASE . '/mailbox.php'; - exit; -} - /* Get the title/mailbox label of the mailbox page. */ $page_label = IMP::getLabel($imp_mbox['mailbox']); -- 2.11.0