From 5bbfc1b098302671bcbf2f754efc627d50eaa5c7 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Thu, 13 Jan 2011 09:25:59 -0500 Subject: [PATCH] Added global functions library which conatins a mail functin that supports attachments and a array_merge function that merges arrays that conatain numeric keys and strings correctly. --- interface/lib/classes/tform.inc.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php index 9537430..ae02efb 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -145,7 +145,7 @@ } if(is_array($wb_global)) { - $wb = $wb_global + $wb; + $wb = $app->functions->array_merge($wb_global,$wb); } if(isset($wb_global)) unset($wb_global); @@ -363,7 +363,7 @@ if(isset($field['datasource']) && is_array($field['datasource'])) { if(is_array($field["value"])) { //$field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record)); - $field["value"] = $field["value"]+$this->getDatasourceData($field, $record); + $field["value"] = $app->functions->array_merge($field["value"],$this->getDatasourceData($field, $record)); } else { $field["value"] = $this->getDatasourceData($field, $record); } @@ -478,7 +478,7 @@ // If Datasource is set, get the data from there if(@is_array($field['datasource'])) { if(is_array($field["value"])) { - $field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record)); + $field["value"] = $app->functions->array_merge($field["value"],$this->getDatasourceData($field, $record)); } else { $field["value"] = $this->getDatasourceData($field, $record); } -- Gitblit v1.9.1