Fixed handles configuration is missing. Closes #47.

Signed-off-by: crynobone <crynobone@gmail.com>
orchestral · Jun 20, 2013 · fed0817 · fed0817
1 parent 4936686
commit fed0817
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/controllers/ExtensionsController.php b/src/controllers/ExtensionsController.php
@@ -108,8 +108,9 @@ public function getConfigure($name)
 
 		// Load configuration from memory.
 		$memory        = App::memory();
-		$config        = $memory->get("extensions.active.{$name}.config", array());
-		$eloquent      = new Fluent((array) $memory->get("extension_{$name}", $config));
+		$activeConfig  = (array) $memory->get("extensions.active.{$name}.config", array());
+		$baseConfig    = (array) $memory->get("extension_{$name}", array());
+		$eloquent      = new Fluent(array_merge($activeConfig, $baseConfig));
 		$extensionName = $memory->get("extensions.available.{$name}.name", $name);
 
 		// Add basic form, allow extension to add custom configuration field