diff --git a/niucloud/app/common.php b/niucloud/app/common.php index 6ae05b1b08019e5412585334329b2026b10496c2..5c9f5074460d1ef1c65f31c05cef3833548bef67 100644 --- a/niucloud/app/common.php +++ b/niucloud/app/common.php @@ -451,6 +451,8 @@ function check_event_result($result) */ function array_merge2(array $array1, array $array2) { + if (empty($array2)) + return $array1; foreach ($array2 as $array2_k => $array2_v) { if (array_key_exists($array2_k, $array1)) { foreach ($array2_v as $array2_kk => $array2_vv) {