From d44e586a6eca4bb5df77f6d4a79417ac30089f58 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Sun, 8 Nov 2009 01:10:19 -0700 Subject: [PATCH] Fix variables. --- imp/lib/Views/ShowMessage.php | 8 ++++---- imp/message.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/imp/lib/Views/ShowMessage.php b/imp/lib/Views/ShowMessage.php index 1b25a1ac9..4ee13785d 100644 --- a/imp/lib/Views/ShowMessage.php +++ b/imp/lib/Views/ShowMessage.php @@ -261,25 +261,25 @@ class IMP_Views_ShowMessage $result['js'] = array_merge($result['js'], $inlineout['js_onload']); $result['msgtext'] .= $inlineout['msgtext']; - if (count($atc_parts) || + if (count($inlineout['atc_parts']) || (($show_parts == 'all') && count($inlineout['display_ids']) > 2)) { $result['atc_label'] = ($show_parts == 'all') ? _("Parts") - : sprintf(ngettext("%d Attachment", "%d Attachments", count($atc_parts)), count($atc_parts)); + : sprintf(ngettext("%d Attachment", "%d Attachments", count($inlineout['atc_parts'])), count($inlineout['atc_parts'])); if (count($inlineout['display_ids']) > 2) { $result['atc_download'] = Horde::link($imp_contents->urlView($imp_contents->getMIMEMessage(), 'download_all')) . '[' . _("Save All") . ']'; } } /* Show attachment information in headers? */ - if (!empty($atc_parts)) { + if (!empty($inlineout['atc_parts'])) { $tmp = ''; if ($show_parts == 'all') { array_unshift($part_info, 'id'); } - foreach ($atc_parts as $id) { + foreach ($inlineout['atc_parts'] as $id) { $summary = $imp_contents->getSummary($id, $contents_mask); $tmp .= ''; foreach ($part_info as $val) { diff --git a/imp/message.php b/imp/message.php index 3c97b7475..c2a3f6b18 100644 --- a/imp/message.php +++ b/imp/message.php @@ -608,14 +608,14 @@ if (count($inlineout['display_ids']) > 2) { } /* Show attachment information in headers? */ -if (!empty($atc_parts)) { +if (!empty($inlineout['atc_parts'])) { $tmp = array(); if ($show_parts == 'all') { array_unshift($part_info, 'id'); } - foreach ($atc_parts as $id) { + foreach ($inlineout['atc_parts'] as $id) { $summary = $imp_contents->getSummary($id, $contents_mask); $tmp[] = ''; foreach ($part_info as $val) { -- 2.11.0