array_merge 대신 + 기호로 충분한 경우(dictionary) +로 변경함.
This commit is contained in:
@@ -70,12 +70,12 @@ foreach (AppConf::getList() as $setting) {
|
||||
];
|
||||
}
|
||||
|
||||
$state = array_merge($state, [
|
||||
$state += [
|
||||
'name' => $serverDir,
|
||||
'korName' => $serverKorName,
|
||||
'color' => $serverColor,
|
||||
'isRoot' => $serverDir == $rootServer
|
||||
]);
|
||||
];
|
||||
$server[] = $state;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user