From 8bed5e0151eb375e2d2dc91e4e6c6d5aa62daa5c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 19 Jul 2015 05:06:48 -0400
Subject: [PATCH] Fix regression where compose editor mode was set incorrectly
---
program/steps/utils/killcache.inc | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/program/steps/utils/killcache.inc b/program/steps/utils/killcache.inc
index eb96450..ca0c687 100644
--- a/program/steps/utils/killcache.inc
+++ b/program/steps/utils/killcache.inc
@@ -1,6 +1,6 @@
<?php
-/*
+/**
+-----------------------------------------------------------------------+
| program/steps/utils/killcache.inc |
| |
@@ -25,35 +25,30 @@
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());
+$res = $RCMAIL->db->query("DELETE FROM " . $RCMAIL->db->table_name('cache', true));
+if ($err = $RCMAIL->db->is_error($res)) {
+ exit($err);
}
-$res = $RCMAIL->db->query("DELETE FROM cache_messages");
-if (PEAR::isError($res)) {
- exit($res->getMessage());
+$res = $RCMAIL->db->query("DELETE FROM " . $RCMAIL->db->table_name('cache_shared', true));
+if ($err = $RCMAIL->db->is_error($res)) {
+ exit($err);
}
-$res = $RCMAIL->db->query("DELETE FROM cache_index");
-if (PEAR::isError($res)) {
- exit($res->getMessage());
+$res = $RCMAIL->db->query("DELETE FROM " . $RCMAIL->db->table_name('cache_messages', true));
+if ($err = $RCMAIL->db->is_error($res)) {
+ exit($err);
}
-$res = $RCMAIL->db->query("DELETE FROM cache_thread");
-if (PEAR::isError($res)) {
- exit($res->getMessage());
+$res = $RCMAIL->db->query("DELETE FROM " . $RCMAIL->db->table_name('cache_index', true));
+if ($err = $RCMAIL->db->is_error($res)) {
+ exit($err);
+}
+
+$res = $RCMAIL->db->query("DELETE FROM " . $RCMAIL->db->table_name('cache_thread', true));
+if ($err = $RCMAIL->db->is_error($res)) {
+ exit($err);
}
echo "Cache cleared\n";
--
Gitblit v1.9.1