From 0deff130c6d7404da71e9ab9d8ee738112bd4f74 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 05 Jun 2015 10:47:18 -0400
Subject: [PATCH] add mailfilter to resync
---
interface/lib/classes/db_mysql.inc.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index f118fd6..9fbb227 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -668,7 +668,7 @@
$key_str = substr($key_str, 0, -1);
$val_str = substr($val_str, 0, -1);
$insert_data_str = '('.$key_str.') VALUES ('.$val_str.')';
- $this->query("INSERT INTO ?? $insert_data_str", true, $params + $v_params);
+ $this->query("INSERT INTO ?? $insert_data_str", true, array_merge($params, $v_params));
} else {
/* TODO: deprecate this method! */
$insert_data_str = $insert_data;
--
Gitblit v1.9.1