From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 24 Jun 2009 04:28:53 +0000 (-0600)
Subject: Do this check earlier.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c984e1d5625bfab090a33b4db09c145d0ec25d9a;p=horde.git

Do this check earlier.
---

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']);