Permalink
Browse files

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

  • Loading branch information...
1 parent 23ec686 commit 511ffca38ed95bec1847eb1e5a8ba17f5ce714ef @rtuin rtuin committed Feb 17, 2012
Showing with 8 additions and 5 deletions.
  1. +8 −5 Config/Ini.php
View
13 Config/Ini.php 100644 → 100755
@@ -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;
}
}

0 comments on commit 511ffca

Please sign in to comment.