Index: CHANGELOG
===================================================================
--- CHANGELOG	(revision 4f9c8337420327802baf73cde7d96b991b1fd1a9)
+++ CHANGELOG	(revision 1a659d789f8a30b0e8ee21f1c34abdfc1e1cd737)
@@ -1,4 +1,8 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/05/08 (alec)
+----------
+- Don't attempt to delete cache entries if enable_caching is FALSE (#1485051)
 
 2008/05/07 (davidke/richs)
Index: program/include/session.inc
===================================================================
--- program/include/session.inc	(revision 2912dbd2c22220d657e5d5d9935f91c09b1103a4)
+++ program/include/session.inc	(revision 1a659d789f8a30b0e8ee21f1c34abdfc1e1cd737)
@@ -25,5 +25,4 @@
   return TRUE;
   }
-
 
 
@@ -91,6 +90,4 @@
                 $vars,
                 $_SERVER['REMOTE_ADDR']);
-                
-
     }
 
@@ -102,13 +99,16 @@
 function sess_destroy($key)
   {
-  global $DB;
+  global $DB, $CONFIG;
   
   if ($DB->is_error())
     return FALSE;
-  
-  // delete session entries in cache table
-  $DB->query("DELETE FROM ".get_table_name('cache')."
-              WHERE  session_id=?",
+
+  if ($CONFIG['enable_caching'])
+    {
+    // delete session entries in cache table
+    $DB->query("DELETE FROM ".get_table_name('cache')."
+              WHERE session_id=?",
               $key);
+    }
               
   $DB->query("DELETE FROM ".get_table_name('session')."
@@ -123,5 +123,5 @@
 function sess_gc($maxlifetime)
   {
-  global $DB;
+  global $DB, $CONFIG;
 
   if ($DB->is_error())
@@ -138,11 +138,13 @@
     $a_exp_sessions[] = $sql_arr['sess_id'];
 
-  
   if (sizeof($a_exp_sessions))
     {
-    // delete session cache records
-    $DB->query("DELETE FROM ".get_table_name('cache')."
-                WHERE  session_id IN ('".join("','", $a_exp_sessions)."')");
-                
+    if ($CONFIG['enable_caching'])
+      {
+        // delete session cache records
+	$DB->query("DELETE FROM ".get_table_name('cache')."
+                WHERE session_id IN ('".join("','", $a_exp_sessions)."')");
+      }
+                  
     // delete session records
     $DB->query("DELETE FROM ".get_table_name('session')."
@@ -151,5 +153,6 @@
 
   // also run message cache GC
-  rcmail_message_cache_gc();
+  if ($CONFIG['enable_caching'])
+    rcmail_message_cache_gc();
   rcmail_temp_gc();