diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-10 14:40:35 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-10 14:40:35 -0300 |
commit | e4ec944eacbb58ed682614cb3271dc58e4d71b52 (patch) | |
tree | 44cf76e435636bc907934133c07ee89056eafb92 /activesupport/CHANGELOG.md | |
parent | 1f11dbf0b4dacede0da1be1a0675e501d1b0fced (diff) | |
parent | 9d6a5b44320bb4655cf7b633668fed1ab8ddcac2 (diff) | |
download | rails-e4ec944eacbb58ed682614cb3271dc58e4d71b52.tar.gz rails-e4ec944eacbb58ed682614cb3271dc58e4d71b52.tar.bz2 rails-e4ec944eacbb58ed682614cb3271dc58e4d71b52.zip |
Merge branch 'fix-json-encoding'
This is the compination of #10057 and 10534.
Closes #10320
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r-- | activesupport/CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 2e04b17e78..7c666a9b83 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,9 @@ +* Added escaping of U+2028 and U+2029 inside the json encoder. + These characters are legal in JSON but break the Javascript interpreter. + After escaping them, the JSON is still legal and can be parsed by Javascript. + + *Mario Caropreso + Viktor Kelemen + zackham* + * Fix skipping object callbacks using metadata fetched via callback chain inspection methods (`_*_callbacks`) |