Config got reset, settings didn't get filled after re-creation

Enrise · Feb 17, 2012 · 511ffca · 511ffca
1 parent 23ec686
commit 511ffca
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Config/Ini.php b/Config/Ini.php
@@ -214,14 +214,17 @@ public static function getConfig()
 
             // Allow application-wide access
             Glitch_Registry::setConfig(self::$_config);
+        }
 
-            // Store the application settings, if any
-            $settings = self::$_config->get('settings');
-            if (null !== $settings)
-            {
-                Glitch_Registry::setSettings($settings);
+        // Store the application settings, if any
+        if (!Glitch_Registry::isRegistered(Glitch_Registry::KEY_SETTINGS)) {
+            $settings = self::$_config->get('settings');
+            if (null !== $settings)
+            {
+                Glitch_Registry::setSettings($settings);
             }
         }
+
         return self::$_config;
     }
 }