From 2258502d462e12c6602f0ae5d9b43a2a5359978b Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 11 Jul 2016 06:55:28 -0400
Subject: [PATCH] Merge branch 'dutch-language' into '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