summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/rcube_imap.php
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-19 06:56:52 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-19 06:56:52 +0000
commit2c79c401f0c4fc90ecd9fc06ae1eb5dbf8a3dca2 (patch)
tree339546a033fafd1ad32e2400f556857e2a3326e2 /roundcubemail/program/include/rcube_imap.php
parent1cd0d8c483f99cad1bd4e43e6fa9e3b6ec785931 (diff)
- Fix incorrect cache ttl used in get_cache_engine() (#1488447), use time() where mktime() without arguments was used
git-svn-id: https://svn.roundcube.net/trunk@6101 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/rcube_imap.php')
-rw-r--r--roundcubemail/program/include/rcube_imap.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 2e1e3ede5..daba72e50 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -3531,7 +3531,9 @@ class rcube_imap extends rcube_storage
{
if ($this->caching && !$this->cache) {
$rcube = rcube::get_instance();
- $ttl = $rcube->config->get('message_cache_lifetime', '10d') - mktime();
+ $ttl = $rcube->config->get('message_cache_lifetime', '10d');
+ $ttl = get_offset_time($ttl) - time();
+
$this->cache = $rcube->get_cache('IMAP', $this->caching, $ttl);
}