Index: branches/5.2.x/core/units/custom_data/custom_data_event_handler.php
===================================================================
diff -u -N -r14092 -r14095
--- branches/5.2.x/core/units/custom_data/custom_data_event_handler.php	(.../custom_data_event_handler.php)	(revision 14092)
+++ branches/5.2.x/core/units/custom_data/custom_data_event_handler.php	(.../custom_data_event_handler.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_data_event_handler.php 14092 2010-11-26 22:43:15Z alex $
+* @version	$Id: custom_data_event_handler.php 14095 2010-12-28 17:37:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -193,7 +193,7 @@
 				if (!isset($virtual_fields['cust_'.$custom_name])) {
 					$virtual_fields['cust_'.$custom_name] = Array();
 				}
-				$virtual_fields['cust_'.$custom_name] = array_merge_recursive2($field_options, $virtual_fields['cust_'.$custom_name]);
+				$virtual_fields['cust_'.$custom_name] = kUtil::array_merge_recursive($field_options, $virtual_fields['cust_'.$custom_name]);
 				$custom_fields[$custom_id] = $custom_name;
 			}
 
@@ -203,7 +203,7 @@
 					continue;
 				}
 
-				$config_calculated_fields[$special] = array_merge_recursive2($config_calculated_fields[$special], $calculated_fields);
+				$config_calculated_fields[$special] = array_merge($config_calculated_fields[$special], $calculated_fields);
 			}
 			$this->Application->setUnitOption($prefix, 'CalculatedFields', $config_calculated_fields);