[Svn] r1947 - trunk/roundcubemail/program/steps/mail

trac at roundcube.net trac at roundcube.net
Mon Oct 6 21:39:51 CEST 2008


Author: alec
Date: 2008-10-06 14:39:51 -0500 (Mon, 06 Oct 2008)
New Revision: 1947

Modified:
   trunk/roundcubemail/program/steps/mail/show.inc
Log:
#1485446: calculate message's ETAG including inline_images option (for multipart messages) 


Modified: trunk/roundcubemail/program/steps/mail/show.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/show.inc	2008-10-06 18:59:22 UTC (rev 1946)
+++ trunk/roundcubemail/program/steps/mail/show.inc	2008-10-06 19:39:51 UTC (rev 1947)
@@ -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)

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list