From a88792546f52b527a3499af5c8a21480be3a880a Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 06 Oct 2008 15:39:51 -0400
Subject: [PATCH] #1485446: calculate message's ETAG including inline_images option (for multipart messages) 

---
 program/steps/mail/show.inc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index d8478d5..4f52538 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -55,7 +55,11 @@
   }
 
   // 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)

--
Gitblit v1.9.1