Skip to content

Commit e4bf4ad

Browse files
authored
Ensure we merge the array recursive, so we don't overwrite default settings inadvertently.
1 parent 73efbec commit e4bf4ad

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/RedactorConfig.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function getConfig(): array
4646
{
4747
$extension = $this->registry->getExtension(Extension::class);
4848

49-
return array_merge($this->getDefaults(), $extension->getConfig()['default'], $this->getLinks());
49+
return array_merge_recursive($this->getDefaults(), $extension->getConfig()['default'], $this->getLinks());
5050
}
5151

5252
public function getPlugins(): array
@@ -56,7 +56,7 @@ public function getPlugins(): array
5656
$plugins = $this->getDefaultPlugins();
5757

5858
if (is_array($extension->getConfig()['plugins'])) {
59-
$plugins = array_merge($plugins, $extension->getConfig()['plugins']);
59+
$plugins = array_merge_recursive($plugins, $extension->getConfig()['plugins']);
6060
}
6161

6262
return $plugins;

0 commit comments

Comments
 (0)