diff -r 935f3799b654 -r ec9385bb7243 includes/functions.php --- a/includes/functions.php Mon Jul 07 18:12:30 2008 -0400 +++ b/includes/functions.php Mon Jul 07 18:13:01 2008 -0400 @@ -579,6 +579,23 @@ return $arr; } +/** + * Implementation of array_merge() that preserves key names. $arr2 takes precedence over $arr1. + * @param array $arr1 + * @param array $arr2 + * @return array + */ + +function enano_safe_array_merge($arr1, $arr2) +{ + $arr3 = $arr1; + foreach($arr2 as $k => $v) + { + $arr3[$k] = $v; + } + return $arr3; +} + // Convert IP address to hex string // Input: 127.0.0.1 (string) // Output: 0x7f000001 (string)