aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2008-04-08 03:47:08 +0000
committerRick Olson <technoweenie@gmail.com>2008-04-08 03:47:08 +0000
commit7e94cf7f4d4c865a84cf835349bdb51c5e71a842 (patch)
tree6642478351c8580858eb336e6b50249ecb20b0c1 /railties
parent605196c4483bbba932804e78cd6d4166f4e29bbb (diff)
downloadrails-7e94cf7f4d4c865a84cf835349bdb51c5e71a842.tar.gz
rails-7e94cf7f4d4c865a84cf835349bdb51c5e71a842.tar.bz2
rails-7e94cf7f4d4c865a84cf835349bdb51c5e71a842.zip
set ActiveSupport.escape_html_entities_in_json = false for new rails apps
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9239 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rw-r--r--railties/configs/initializers/new_rails_defaults.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/configs/initializers/new_rails_defaults.rb b/railties/configs/initializers/new_rails_defaults.rb
index d10b16b06e..3a617e3ae3 100644
--- a/railties/configs/initializers/new_rails_defaults.rb
+++ b/railties/configs/initializers/new_rails_defaults.rb
@@ -8,4 +8,8 @@ ActiveRecord::Base.partial_updates = true
ActiveRecord::Base.include_root_in_json = true
# Use ISO 8601 format for JSON serialized times and dates
-ActiveSupport.use_standard_json_time_format = true \ No newline at end of file
+ActiveSupport.use_standard_json_time_format = true
+
+# Don't escape HTML entities in JSON, leave that for the #json_escape helper
+# if you're including raw json in an HTML page.
+ActiveSupport.escape_html_entities_in_json = false \ No newline at end of file