From fed0817cde1321e82793ebcf90c0d182b5b83eca Mon Sep 17 00:00:00 2001 From: crynobone Date: Thu, 20 Jun 2013 18:30:46 +0800 Subject: [PATCH] Fixed handles configuration is missing. Closes #47. Signed-off-by: crynobone --- src/controllers/ExtensionsController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/controllers/ExtensionsController.php b/src/controllers/ExtensionsController.php index 97653d2f..6937be9f 100644 --- 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