diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-03-11 22:07:48 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-03-11 22:07:48 +1100 |
| commit | 965fe59bff249ad91131a444e1fbd63dc4411db3 (patch) | |
| tree | ec2d54d5eaad9e32bce1758e6a67c364279bbd39 /actionpack/lib/action_view/helpers/tag_helper.rb | |
| parent | 79f02a473cb6aef00003745f23802314c8c89e7d (diff) | |
| parent | 4adcbb6b2d6cef49ac28df4254ac74e09f14dcf7 (diff) | |
| download | rails-965fe59bff249ad91131a444e1fbd63dc4411db3.tar.gz rails-965fe59bff249ad91131a444e1fbd63dc4411db3.tar.bz2 rails-965fe59bff249ad91131a444e1fbd63dc4411db3.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_view/helpers/tag_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/tag_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb index ed80e07c78..a3a8185f40 100644 --- a/actionpack/lib/action_view/helpers/tag_helper.rb +++ b/actionpack/lib/action_view/helpers/tag_helper.rb @@ -72,7 +72,7 @@ module ActionView content_tag = content_tag_string(name, capture(&block), options, escape) if block_called_from_erb?(block) - concat(content_tag) + safe_concat(content_tag) else content_tag end |