aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/railtie.rb
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2013-11-01 11:50:05 +1300
committerAaron Patterson <aaron.patterson@gmail.com>2013-12-02 14:02:15 -0800
commit78790e4bceedc632cb40f9597792d7e27234138a (patch)
tree4674ee7ae675a134f3481523bfd6eef450344512 /actionpack/lib/action_dispatch/railtie.rb
parent5ed70c591fa086d745b35a16713d91fc0e3ec858 (diff)
downloadrails-78790e4bceedc632cb40f9597792d7e27234138a.tar.gz
rails-78790e4bceedc632cb40f9597792d7e27234138a.tar.bz2
rails-78790e4bceedc632cb40f9597792d7e27234138a.zip
Stop using i18n's built in HTML error handling.
i18n doesn't depend on active support which means it can't use our html_safe code to do its escaping when generating the spans. Rather than try to sanitize the output from i18n, just revert to our old behaviour of rescuing the error and constructing the tag ourselves. Fixes: CVE-2013-4491 Conflicts: actionpack/lib/action_view/helpers/translation_helper.rb Backport: 50afd8eec9d088ad5a2d41f00a05520d5b78a6a0
Diffstat (limited to 'actionpack/lib/action_dispatch/railtie.rb')
0 files changed, 0 insertions, 0 deletions