Imported Upstream version 0.7.2

[roundcube.git] / program / include / main.inc

diff --git a/program/include/main.inc b/program/include/main.inc
index c402ca1d02ead4f3644977b07dc45deb23395304..e2d6514d62c46cf10b50da9ee7cc0d62b834b804 100644 (file)
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: main.inc 5715 2012-01-05 10:28:24Z alec $
+ $Id: main.inc 5943 2012-03-02 11:56:25Z alec $
 
 */
 
@@ -169,14 +169,16 @@ function rcmail_cache_gc()
   // get target timestamp
   $ts = get_offset_time($rcmail->config->get('message_cache_lifetime', '30d'), -1);
 
-  $db->query("DELETE FROM ".get_table_name('cache_messages')
+  if ($rcmail->config->get('messages_cache') || $rcmail->config->get('enable_caching')) {
+    $db->query("DELETE FROM ".get_table_name('cache_messages')
         ." WHERE changed < " . $db->fromunixtime($ts));
 
-  $db->query("DELETE FROM ".get_table_name('cache_index')
+    $db->query("DELETE FROM ".get_table_name('cache_index')
         ." WHERE changed < " . $db->fromunixtime($ts));
 
-  $db->query("DELETE FROM ".get_table_name('cache_thread')
+    $db->query("DELETE FROM ".get_table_name('cache_thread')
         ." WHERE changed < " . $db->fromunixtime($ts));
+  }
 
   $db->query("DELETE FROM ".get_table_name('cache')
         ." WHERE created < " . $db->fromunixtime($ts));