From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
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 c7105ec..c74e6e0 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -563,7 +563,7 @@
}
$query = 'INSERT INTO ?? (' . $k_query . ') VALUES (' . $v_query . ')';
- return $this->query($query, true, $params + $v_params);
+ return $this->query($query, true, array_merge($params, $v_params));
}
public function diffrec($record_old, $record_new) {
--
Gitblit v1.9.1