summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-06-06 09:20:02 +0200
committerAleksander Machniak <alec@alec.pl>2013-06-06 09:20:02 +0200
commit67ac6e354ab6c12e708415d2949936b4dc427275 (patch)
tree07ad1c42451c53226b45f8466a2e7946651aefda
parentb07426f0c55f2fd2126dd2080e6a89bd334017f9 (diff)
Rename message_cache_lifetime to messages_cache_ttl option for naming consistency
-rw-r--r--config/main.inc.php.dist5
-rw-r--r--program/lib/Roundcube/rcube_config.php1
-rw-r--r--program/lib/Roundcube/rcube_imap.php4
3 files changed, 5 insertions, 5 deletions
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 4cf94c7f8..506edd9cc 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -128,9 +128,8 @@ $rcmail_config['imap_cache'] = null;
// Enables messages cache. Only 'db' cache is supported.
$rcmail_config['messages_cache'] = false;
-// lifetime of message cache
-// possible units: s, m, h, d, w
-$rcmail_config['message_cache_lifetime'] = '10d';
+// Lifetime of messages cache. Possible units: s, m, h, d, w
+$rcmail_config['messages_cache_ttl'] = '10d';
// ----------------------------------
// SMTP
diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php
index f694877b0..bd97583c3 100644
--- a/program/lib/Roundcube/rcube_config.php
+++ b/program/lib/Roundcube/rcube_config.php
@@ -43,6 +43,7 @@ class rcube_config
'reply_mode' => 'top_posting',
'refresh_interval' => 'keep_alive',
'min_refresh_interval' => 'min_keep_alive',
+ 'messages_cache_ttl' => 'message_cache_lifetime',
);
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index 31e7079fb..b362f1316 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -3691,7 +3691,7 @@ class rcube_imap extends rcube_storage
{
if ($this->caching && !$this->cache) {
$rcube = rcube::get_instance();
- $ttl = $rcube->config->get('message_cache_lifetime', '10d');
+ $ttl = $rcube->config->get('messages_cache_ttl', '10d');
$this->cache = $rcube->get_cache('IMAP', $this->caching, $ttl);
}
@@ -3745,7 +3745,7 @@ class rcube_imap extends rcube_storage
public function expunge_cache()
{
if ($this->mcache) {
- $ttl = rcube::get_instance()->config->get('message_cache_lifetime', '10d');
+ $ttl = rcube::get_instance()->config->get('messages_cache_ttl', '10d');
$this->mcache->expunge($ttl);
}