From 65b940885cd3f1126bf9b675fcf421f3e0c40d72 Mon Sep 17 00:00:00 2001
From: Fengstyle <sncnc@qq.com>
Date: Sat, 9 Sep 2023 11:55:23 +0000
Subject: [PATCH] update niucloud/app/common.php.

Signed-off-by: Fengstyle <sncnc@qq.com>
---
 niucloud/app/common.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/niucloud/app/common.php b/niucloud/app/common.php
index 6ae05b1b0..5c9f50744 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) {
-- 
Gitee