[BUGFIX] fix configuration overwrite.

now it is possible to set plugin config in the config.php: $config['plugins']['phile\\inlineImage'] = array('active' => true, 'images_dir' => 'docs');
PhileCMS · Apr 26, 2014 · beb8b90 · beb8b90
1 parent c3489b7
commit beb8b90
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/Phile/Core.php b/lib/Phile/Core.php
@@ -113,7 +113,7 @@ protected function initializePlugins() {
 						$pluginConfiguration = \Phile\Utility::load($configFile);
 						$globalConfiguration = \Phile\Registry::get('Phile_Settings');
 						if ($pluginConfiguration !== null && is_array($pluginConfiguration)) {
-							$globalConfiguration['plugins'][$pluginKey]['settings'] = $pluginConfiguration;
+							$globalConfiguration['plugins'][$pluginKey]['settings'] = array_replace_recursive($pluginConfiguration, $globalConfiguration['plugins'][$pluginKey]);
 						} else {
 							$globalConfiguration['plugins'][$pluginKey]['settings'] = array();
 						}
@@ -128,7 +128,7 @@ protected function initializePlugins() {
 
 					/** @var \Phile\Plugin\AbstractPlugin $plugin */
 					$plugin = new $pluginClassName;
-					$plugin->injectSettings($pluginConfiguration);
+					$plugin->injectSettings($globalConfiguration['plugins'][$pluginKey]['settings']);
 
 					if ($plugin instanceof \Phile\Plugin\AbstractPlugin) {
 						// register plugin