Merge branch 'hotfix/1.1.10'

erdmannfreunde · Aug 30, 2021 · ad98713 · ad98713
2 parents 53a9b2c + 0dfc2a7
commit ad98713
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG:
 
+# 1.1.10 (29.08.2021)
+- fix: localconfig-Einstellungen aus der config.yml werden nun übernommen (#10)
+
+_Danke katgirl und fritzmg_
+
 # 1.1.9 (14.04.2021)
 - Übersicht für im Theme verwendete CSS-Klassen in `README.md` ergänzt
 

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "keywords":["contao", "erdmannfreunde", "optimist", "theme"],
     "type": "composer-plugin",
     "license": "LGPL-3.0-or-later",
-    "version": "1.1.9",
+    "version": "1.1.10",
     "authors":[
         {
             "name": "Erdmann & Freunde",

diff --git a/src/ContaoManager/Plugin.php b/src/ContaoManager/Plugin.php
@@ -18,7 +18,9 @@ class Plugin implements ExtensionPluginInterface
     public function getExtensionConfig($extensionName, array $extensionConfigs, ContainerBuilder $container)
     {
         if ('contao' === $extensionName) {
-            $extensionConfigs[] = ['localconfig' => ['folderUrl' => true]];
+            foreach($extensionConfigs as $id=>$value) {
+                $extensionConfigs[$id]['localconfig'] = array_merge($extensionConfigs[$id]['localconfig'] ?? [], ['folderUrl' => true]);
+            }
         }
 
         return $extensionConfigs;