From e1e20f2dc245ec4ac5039a533a037872b28a5436 Mon Sep 17 00:00:00 2001
From: EC2 Default User
 <ec2-user@ip-172-26-0-185.ap-northeast-2.compute.internal>
Date: Tue, 20 Jul 2021 01:07:56 +0000
Subject: [PATCH] =?UTF-8?q?skin=20=EB=94=94=EB=A0=89=ED=86=A0=EB=A6=AC?=
 =?UTF-8?q?=EA=B0=80=20=EC=97=86=EA=B1=B0=EB=82=98=20=EA=B2=BD=EB=A1=9C?=
 =?UTF-8?q?=EA=B0=80=20=EC=9E=98=EB=AA=BB=20=EB=90=9C=20=EA=B2=BD=EC=9A=B0?=
 =?UTF-8?q?=20=EB=82=98=EC=98=A4=EB=8A=94=20=EB=82=98=EC=98=A4=EB=8A=94=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20PHP=20Warning:=20=20a?=
 =?UTF-8?q?rray=5Fmerge():=20Argument=20#2=20is=20not=20an=20array=20(?=
 =?UTF-8?q?=EC=97=91=EC=8A=A4=EC=97=A0=EC=97=98=EB=8B=98,210716)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/admin.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adm/admin.lib.php b/adm/admin.lib.php
index 08b18fb4c..1918f2748 100644
--- a/adm/admin.lib.php
+++ b/adm/admin.lib.php
@@ -83,7 +83,7 @@ function get_skin_dir($skin, $skin_path=G5_SKIN_PATH)
 
     $dirname = $skin_path.'/'.$skin.'/';
     if(!is_dir($dirname))
-        return;
+        return array();
 
     $handle = opendir($dirname);
     while ($file = readdir($handle)) {