From d6b6d22168e00130de9ce544ee661cc791b239f3 Mon Sep 17 00:00:00 2001 From: alex-brainstorm Date: Sun, 31 Aug 2003 23:54:01 +0000 Subject: [PATCH] Fix: put the right includes there git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5598 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/read_body.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/read_body.php b/src/read_body.php index 22835df5..81bd5e1c 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -25,6 +25,7 @@ require_once(SM_PATH . 'functions/url_parser.php'); require_once(SM_PATH . 'functions/html.php'); require_once(SM_PATH . 'functions/global.php'); require_once(SM_PATH . 'functions/identity.php'); +require_once(SM_PATH . 'functions/mailbox_display.php'); /** * Given an IMAP message id number, this will look it up in the cached @@ -394,13 +395,12 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $env = array(); $env[_("Subject")] = str_replace(" "," ",decodeHeader($header->subject)); $from_name = $header->getAddr_s('from'); - if (!$from_name) { + if (!$from_name) $from_name = $header->getAddr_s('sender'); - if (!$from_name) { - $from_name = _("Unknown sender"); - } - } - $env[_("From")] = decodeHeader($from_name); + if (!$from_name) + $env[_("From")] = _("Unknown sender"); + else + $env[_("From")] = decodeHeader($from_name); $env[_("Date")] = getLongDateString($header->date); $env[_("To")] = formatRecipientString($header->to, "to"); $env[_("Cc")] = formatRecipientString($header->cc, "cc"); -- 2.25.1