summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-10-06 19:39:51 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-10-06 19:39:51 +0000
commite8c088a5c5acbee38a1ef241b46927b89589a7ff (patch)
tree0ae3aa7eafafc60f7817e9e808c579a983282cc5
parent3232f764088cb88f51c8a8d7953e45ec99f14523 (diff)
#1485446: calculate message's ETAG including inline_images option (for multipart messages)
git-svn-id: https://svn.roundcube.net/trunk@1947 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/program/steps/mail/show.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/roundcubemail/program/steps/mail/show.inc b/roundcubemail/program/steps/mail/show.inc
index d8478d569..4f5253883 100644
--- a/roundcubemail/program/steps/mail/show.inc
+++ b/roundcubemail/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)