- fixed array merge

Marius Cramer · Marius Cramer · commit e559f3b686ae · 2015-08-17T11:45:42.000+02:00
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
@@ -141,7 +141,7 @@ function processDatalog() {
 							$f_params[] = $fieldname;
 							$params[] = $val;
 						}
-						$params = $f_params + $params;
+						$params = array_merge($f_params, $params);
 						unset($f_params);
 						
 						$tmp_sql1 = substr($tmp_sql1, 0, -1);

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ function processDatalog() {`
`141`	`141`	`$f_params[] = $fieldname;`
`142`	`142`	`$params[] = $val;`
`143`	`143`	`}`
`144`		`- $params = $f_params + $params;`
	`144`	`+ $params = array_merge($f_params, $params);`
`145`	`145`	`unset($f_params);`
`146`	`146`
`147`	`147`	`$tmp_sql1 = substr($tmp_sql1, 0, -1);`