From f885f2312b3e3fa8f5e5c926699769416309d1f2 Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 9 Feb 2013 13:05:09 +0100 Subject: fall back to {} if config file is empty for environment --- config/initializers/load_config.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/initializers/load_config.rb') diff --git a/config/initializers/load_config.rb b/config/initializers/load_config.rb index a3dbc5f..b2b0318 100644 --- a/config/initializers/load_config.rb +++ b/config/initializers/load_config.rb @@ -2,6 +2,6 @@ def load_config_file(file) File.exists?(file) ? YAML.load_file(file)[Rails.env] : {} end -defaults = load_config_file("#{Rails.root}/config/defaults.yml") -config = load_config_file("#{Rails.root}/config/config.yml") +defaults = load_config_file("#{Rails.root}/config/defaults.yml") || {} +config = load_config_file("#{Rails.root}/config/config.yml") || {} APP_CONFIG = defaults.merge(config).with_indifferent_access -- cgit v1.2.3