From 5613fb0b8751440f162ffc59869848ecb41acaf2 Mon Sep 17 00:00:00 2001 From: Egor Homakov Date: Fri, 11 May 2012 18:11:58 +0400 Subject: Update railties/lib/rails/application/bootstrap.rb --- railties/lib/rails/application/bootstrap.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb index e567df7162..15c5766395 100644 --- a/railties/lib/rails/application/bootstrap.rb +++ b/railties/lib/rails/application/bootstrap.rb @@ -10,7 +10,17 @@ module Rails initializer :load_environment_hook, :group => :all do end initializer :load_active_support, :group => :all do - require "active_support/all" unless config.active_support.bare + unless config.active_support.bare + require "active_support/all" + + # Assign config options of JSON encoding + [:escape_html_entities_in_json, :use_standard_json_time_format, :encode_big_decimal_as_string].each do |option| + value = config.active_support.send(option) + if !value.nil? + ActiveSupport::JSON::Encoding.send("#{option}=", value) + end + end + end end # Preload all frameworks specified by the Configuration#frameworks. -- cgit v1.2.3