Skip to content

Commit

Permalink
Fall back to development environment.
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelklishin authored and mattetti committed Dec 13, 2008
1 parent 29106ca commit 98b72bd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion merb_sequel/lib/merb/orms/sequel/connection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def config
# Convert string keys to symbols
full_config = Erubis.load_yaml_file(config_file)
config = (Merb::Plugins.config[:merb_sequel] = {})
(full_config[Merb.environment.to_sym] || full_config[Merb.environment]).each do |key, value|
(full_config[Merb.environment.to_sym] || full_config[Merb.environment] || full_config[:development]).each do |key, value|
config[key.to_sym] = value
end
config
Expand Down

0 comments on commit 98b72bd

Please sign in to comment.