diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-10-10 17:15:11 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-10-10 17:15:11 +0100 |
| commit | 66ee2654ff243f03595a402fa15e1eea1b5b45be (patch) | |
| tree | 3f1055e03082f0c767719e8cba5155e4207779e0 /actionmailer | |
| parent | dd2779e1b83b4d867d47dd286ec0c919f5df12a9 (diff) | |
| parent | b9ce8216fa849a47ad0b0f99fa510e226a23c12e (diff) | |
| download | rails-66ee2654ff243f03595a402fa15e1eea1b5b45be.tar.gz rails-66ee2654ff243f03595a402fa15e1eea1b5b45be.tar.bz2 rails-66ee2654ff243f03595a402fa15e1eea1b5b45be.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/test/fixtures/helpers/example_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/test/fixtures/helpers/example_helper.rb b/actionmailer/test/fixtures/helpers/example_helper.rb index d66927aa60..f6a6a49ced 100644 --- a/actionmailer/test/fixtures/helpers/example_helper.rb +++ b/actionmailer/test/fixtures/helpers/example_helper.rb @@ -1,5 +1,5 @@ module ExampleHelper def example_format(text) - "<em><strong><small>#{text}</small></strong></em>" + "<em><strong><small>#{h(text)}</small></strong></em>".html_safe! end end |