summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-10-06 19:39:51 +0000
committeralecpl <alec@alec.pl>2008-10-06 19:39:51 +0000
commita88792546f52b527a3499af5c8a21480be3a880a (patch)
tree21467f4ebf0b154ce37ab75167c6a20968e79091 /program/steps/mail
parentbbeda81b19f4aca4a4cb6509bef8ca59076365d2 (diff)
#1485446: calculate message's ETAG including inline_images option (for multipart messages)
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/show.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index d8478d569..4f5253883 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -55,7 +55,11 @@ if ($_GET['_uid']) {
}
// calculate Etag for this request
- $etag = md5($MESSAGE->uid.$mbox_name.session_id().intval($MESSAGE->headers->mdn_sent).intval($MESSAGE->is_safe).intval($PRINT_MODE));
+ $etag = md5($MESSAGE->uid.$mbox_name.session_id()
+ .intval($MESSAGE->headers->mdn_sent)
+ .intval($MESSAGE->is_safe)
+ .(!empty($MESSAGE->attachments) ? intval($CONFIG['inline_images']) : '')
+ .intval($PRINT_MODE));
// allow caching, unless remote images are present
if ((bool)$MESSAGE->is_safe)