From a2cf7c41b97a587d90188b83e4d15da1567a54b4 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 09 Apr 2014 02:48:28 -0400
Subject: [PATCH] Fix accidental key replacements

---
 program/steps/utils/killcache.inc |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/program/steps/utils/killcache.inc b/program/steps/utils/killcache.inc
index eb96450..1cb99b8 100644
--- a/program/steps/utils/killcache.inc
+++ b/program/steps/utils/killcache.inc
@@ -25,35 +25,25 @@
     die("Access denied!");
 }
 
-$options = array(
-    'use_transactions' => false,
-    'log_line_break' => "\n",
-    'idxname_format' => '%s',
-    'debug' => false,
-    'quote_identifier' => true,
-    'force_defaults' => false,
-    'portability' => true
-);
-
 // @TODO: transaction here (if supported by DB) would be a good thing
 $res = $RCMAIL->db->query("DELETE FROM cache");
-if (PEAR::isError($res)) {
-    exit($res->getMessage());
+if ($err = $RCMAIL->db->is_error($res)) {
+    exit($err);
 }
 
 $res = $RCMAIL->db->query("DELETE FROM cache_messages");
-if (PEAR::isError($res)) {
-    exit($res->getMessage());
+if ($err = $RCMAIL->db->is_error($res)) {
+    exit($err);
 }
 
 $res = $RCMAIL->db->query("DELETE FROM cache_index");
-if (PEAR::isError($res)) {
-    exit($res->getMessage());
+if ($err = $RCMAIL->db->is_error($res)) {
+    exit($err);
 }
 
 $res = $RCMAIL->db->query("DELETE FROM cache_thread");
-if (PEAR::isError($res)) {
-    exit($res->getMessage());
+if ($err = $RCMAIL->db->is_error($res)) {
+    exit($err);
 }
 
 echo "Cache cleared\n";

--
Gitblit v1.9.1