From fab50c130baf482288d510427a6632e6489a55d6 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Fri, 2 Jan 2015 17:07:01 -0600 Subject: Unsafe default translations should not be marked html_safe Previously default translation keys that didn't end in `_html`, but came after a missing key that ended in `_html` were being returned as html_safe. Now they are not. Fixes #18257 --- actionview/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actionview/CHANGELOG.md') diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index 321501a3bf..6357f8ac57 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,8 @@ +* Default translations that have a lower precidence than an html safe default, + but are not themselves safe, should not be marked as html_safe. + + *Justin Coyne* + * Make possible to use blocks with short version of `render "partial"` helper. *Nikolay Shebanov* -- cgit v1.2.3