From 848e204ef9bdaf989e7e48025d4ea6ee21e7678e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 13 Sep 2014 06:36:54 -0400
Subject: [PATCH] Fix validation of email addresses with IDNA domains (#1490067)
---
program/steps/utils/killcache.inc | 31 +++++++++----------------------
1 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/program/steps/utils/killcache.inc b/program/steps/utils/killcache.inc
index 3e85c0a..1cb99b8 100644
--- a/program/steps/utils/killcache.inc
+++ b/program/steps/utils/killcache.inc
@@ -1,6 +1,6 @@
<?php
-/*
+/*
+-----------------------------------------------------------------------+
| program/steps/utils/killcache.inc |
| |
@@ -17,9 +17,6 @@
+-----------------------------------------------------------------------+
| Author: Dennis P. Nikolaenko <dennis@nikolaenko.ru> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
// don't allow public access if not in devel_mode
@@ -28,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