diff options
| author | Prem Sichanugrist <s@sikachu.com> | 2011-06-09 14:00:10 -0400 |
|---|---|---|
| committer | Prem Sichanugrist <s@sikachu.com> | 2011-06-09 14:30:02 -0400 |
| commit | 8c8652c37f6f6969ce48d579a8c9a8ff668f995a (patch) | |
| tree | 89783214af4fbf92f5ce9606c31804af65692faf /actionpack/CHANGELOG | |
| parent | 834bebf9cc5acbf2c6662d1e5458a2726d305341 (diff) | |
| download | rails-8c8652c37f6f6969ce48d579a8c9a8ff668f995a.tar.gz rails-8c8652c37f6f6969ce48d579a8c9a8ff668f995a.tar.bz2 rails-8c8652c37f6f6969ce48d579a8c9a8ff668f995a.zip | |
Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe
Diffstat (limited to 'actionpack/CHANGELOG')
| -rw-r--r-- | actionpack/CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 42baf6f45f..5314dcc193 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *Rails 3.2.0 (unreleased)* +* Make sure escape_js returns SafeBuffer string if it receives SafeBuffer string [Prem Sichanugrist] + * Fix escape_js to work correctly with the new SafeBuffer restriction [Paul Gallagher] * Brought back alternative convention for namespaced models in i18n [thoefer] |