diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-14 08:02:45 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-14 08:02:45 +0200 |
| commit | c13a3f0fc18eec15441e6d88073b92850e93d59a (patch) | |
| tree | ce6cb32dbb94befc8f3065eeb597a8c428208731 | |
| parent | 1839ecd2288680dba8533610eb4c9dfe2ab6326e (diff) | |
| download | rails-c13a3f0fc18eec15441e6d88073b92850e93d59a.tar.gz rails-c13a3f0fc18eec15441e6d88073b92850e93d59a.tar.bz2 rails-c13a3f0fc18eec15441e6d88073b92850e93d59a.zip | |
Since escape_html_entities_in_json was moved to 3-2-stable, make it true in AS, closes #6287
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index ab12f3f454..a6e4e7ced2 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -136,7 +136,7 @@ module ActiveSupport end self.use_standard_json_time_format = true - self.escape_html_entities_in_json = false + self.escape_html_entities_in_json = true self.encode_big_decimal_as_string = true end end diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index 5fa96397f0..d816f973e6 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -44,9 +44,6 @@ module <%= app_const_base %> # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:password] - # Enable escaping HTML in JSON. The default is false. - # config.active_support.escape_html_entities_in_json = true - # Use SQL instead of Active Record's schema dumper when creating the database. # This is necessary if your schema can't be completely dumped by the schema dumper, # like if you have constraints or database-specific column types. |