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 /activesupport/lib/active_support/json/encoding.rb | |
| 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
Diffstat (limited to 'activesupport/lib/active_support/json/encoding.rb')
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 2 |
1 files changed, 1 insertions, 1 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 |