0
@@ -272,8 +272,10 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
0
     # this is crucial: load init file with all the preferences
0
     # then environment init file, then start enabling specific
0
     # components, load dependencies and update logger.
0
-    load_initfile unless Merb::disabled?(:initfile)
0
-    load_env_config
0
+    unless Merb::disabled?(:initfile)
0
+      load_initfile 
0
+      load_env_config
0
+    end
0
     enable_json_gem unless Merb::disabled?(:json)
0
     load_dependencies
0
     update_logger