X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdownload.php;h=6cb6edbc7154f00a53f1beb9f1b8fd0f29f0beb3;hb=a571cff36ff1c340cbd2130ce9c0e2ab7ef96977;hp=72b2c8bfa0c80a1d1a5ff90e06f15a75c8ed302a;hpb=906f7e9fa070f6df07bd4ba8c72a9c7908039761;p=squirrelmail.git

diff --git a/src/download.php b/src/download.php
index 72b2c8bf..6cb6edbc 100644
--- a/src/download.php
+++ b/src/download.php
@@ -22,6 +22,19 @@ require(SM_PATH . 'functions/imap_general.php');
 require(SM_PATH . 'functions/mailbox_display.php');
 require(SM_PATH . 'functions/mime.php');
 
+/**
+ * If a message is viewed from the search page, $aMailbox[$passed_id]['MESSAGE_OBJECT']
+ * is not initialized, which makes this page error out on line 65 with an 
+ * undefined function.  We need to include some additional files in case the
+ * object has not been initialized.
+ * 
+ * TODO: Determine why the object in question is not initialized when coming from
+ *       a search page and correct.  Once that is done, we can remove these
+ *       includes.
+ */
+require(SM_PATH . 'functions/imap_messages.php');
+require(SM_PATH . 'functions/date.php');
+
 header('Pragma: ');
 header('Cache-Control: cache');
 
@@ -50,8 +63,8 @@ if (isset($aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT']) &&
     is_object($aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT']) ) {
     $message = $aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'];
 } else {
-   $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
-   $aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'] = $message;
+    $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+    $aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'] = $message;
 }
 
 $subject = $message->rfc822_header->subject;