Replace array_merge with array_merge_recursive in ThemeController (Az…

…uriom#220)
Oxim0v · Sep 2, 2022 · dabf2ec · dabf2ec
1 parent 8f4a6ad
commit dabf2ec
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/Http/Controllers/Admin/ThemeController.php b/app/Http/Controllers/Admin/ThemeController.php
@@ -98,7 +98,7 @@ public function update(string $theme)
                 if ($oldConfig !== null) {
                     $newConfig = $this->themes->readConfig($theme) ?? [];
 
-                    $this->themes->updateConfig($theme, array_merge($newConfig, $oldConfig));
+                    $this->themes->updateConfig($theme, array_merge_recursive($newConfig, $oldConfig));
                 }
             }
         } catch (Throwable $t) {
@@ -178,7 +178,7 @@ public function config(Request $request, string $theme)
             $config = $this->validate($request, $this->files->getRequire($rulesPath));
 
             if ($request->has('append')) {
-                $config = array_merge($this->themes->readConfig($theme), $config);
+                $config = array_merge_recursive($this->themes->readConfig($theme), $config);
             }
 
             $this->themes->updateConfig($theme, $config);