diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2013-12-04 09:43:42 -0800 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2013-12-04 09:43:42 -0800 |
| commit | 2c564cdbdbe62c319e65abb3631b288f11878987 (patch) | |
| tree | c7357a1edc72576f4981b2060e8e1b6bcaab667e /actionview | |
| parent | c229c7a39c2704e0b5c19c2b4d5edb16ecdcef7f (diff) | |
| download | rails-2c564cdbdbe62c319e65abb3631b288f11878987.tar.gz rails-2c564cdbdbe62c319e65abb3631b288f11878987.tar.bz2 rails-2c564cdbdbe62c319e65abb3631b288f11878987.zip | |
Added \u2028 \u2029 to json_escape
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/CHANGELOG.md | 3 | ||||
| -rw-r--r-- | actionview/test/template/erb_util_test.rb | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index 65d045d1f7..9e58c193b1 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,4 +1,7 @@ * Fixed a long-standing bug in `json_escape` that causes quotation marks to be stripped. + This method also escapes the \u2028 and \u2029 unicode newline characters which are + treated as \n in JavaScript. This matches the behaviour of the AS::JSON encoder. (The + original change in the encoder was introduced in #10534.) *Godfrey Chan* diff --git a/actionview/test/template/erb_util_test.rb b/actionview/test/template/erb_util_test.rb index 62067ad097..9bacbba908 100644 --- a/actionview/test/template/erb_util_test.rb +++ b/actionview/test/template/erb_util_test.rb @@ -33,7 +33,8 @@ class ErbUtilTest < ActiveSupport::TestCase ['"&"', '"\u0026"'], ['"</script>"', '"\u003c/script\u003e"'], ['["</script>"]', '["\u003c/script\u003e"]'], - ['{"name":"</script>"}', '{"name":"\u003c/script\u003e"}'] + ['{"name":"</script>"}', '{"name":"\u003c/script\u003e"}'], + [%({"name":"d\u2028h\u2029h"}), '{"name":"d\u2028h\u2029h"}'] ] def test_html_escape |