summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-01-07 18:14:08 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-01-07 18:14:08 +0000
commit3904fa7197455876cf6dd83780708e3d979d27c3 (patch)
tree917e1a416b6030bd78ede23fc25af0b79318235d
parent98dc58f608c160b97235a01027fc147a4524a331 (diff)
Applied patch for preview caching (closes #1484186)
git-svn-id: https://svn.roundcube.net/trunk@449 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG5
-rw-r--r--roundcubemail/program/steps/mail/show.inc7
2 files changed, 10 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 2c04a3bae..399162b69 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,11 @@
CHANGELOG RoundCube Webmail
---------------------------
+2007/01/07 (thomasb)
+----------
+- Applied patch for preview caching (closes #1484186)
+- Added Thai localization files
+
2006/12/29 (thomasb)
----------
- Added error handling for attachment uploads
diff --git a/roundcubemail/program/steps/mail/show.inc b/roundcubemail/program/steps/mail/show.inc
index aa5b3733d..b1fa7cfb7 100644
--- a/roundcubemail/program/steps/mail/show.inc
+++ b/roundcubemail/program/steps/mail/show.inc
@@ -23,8 +23,11 @@ require_once('Mail/mimeDecode.php');
$PRINT_MODE = $_action=='print' ? TRUE : FALSE;
-// allow this request to be cached
-send_future_expire_header();
+// allow caching, unless remote images are present
+if ((bool)get_input_value('_safe', RCUBE_INPUT_GET))
+ send_nocacheing_headers();
+else
+ send_future_expire_header();
// similar code as in program/steps/mail/get.inc
if ($_GET['_uid'])