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 | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/program/steps/utils/killcache.inc b/program/steps/utils/killcache.inc
index 643433c..1cb99b8 100644
--- a/program/steps/utils/killcache.inc
+++ b/program/steps/utils/killcache.inc
@@ -1,22 +1,22 @@
<?php
-/*
+/*
+-----------------------------------------------------------------------+
| program/steps/utils/killcache.inc |
| |
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2005-2010, The Roundcube Dev Team |
- | Licensed under the GNU GPL |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
- | Delete rows from cache and messages tables |
+ | Delete rows from cache tables |
| |
+-----------------------------------------------------------------------+
| Author: Dennis P. Nikolaenko <dennis@nikolaenko.ru> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
// don't allow public access if not in devel_mode
@@ -25,28 +25,26 @@
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 messages");
-if (PEAR::isError($res)) {
- exit($res->getMessage());
+$res = $RCMAIL->db->query("DELETE FROM cache_messages");
+if ($err = $RCMAIL->db->is_error($res)) {
+ exit($err);
+}
+
+$res = $RCMAIL->db->query("DELETE FROM cache_index");
+if ($err = $RCMAIL->db->is_error($res)) {
+ exit($err);
+}
+
+$res = $RCMAIL->db->query("DELETE FROM cache_thread");
+if ($err = $RCMAIL->db->is_error($res)) {
+ exit($err);
}
echo "Cache cleared\n";
exit;
-
-
--
Gitblit v1.9.1