diff options
| author | Rick Olson <technoweenie@gmail.com> | 2006-10-18 15:58:07 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2006-10-18 15:58:07 +0000 |
| commit | 02358c83b76f9fc56b6cabaee24b244d17d08cff (patch) | |
| tree | 88b5b9b207163e5d5ceb48e6e7c672c78dc65d91 /actionpack/lib/action_view/helpers/tag_helper.rb | |
| parent | a0f74092a8fa1eff96de67b70c711fd8408a4ab5 (diff) | |
| download | rails-02358c83b76f9fc56b6cabaee24b244d17d08cff.tar.gz rails-02358c83b76f9fc56b6cabaee24b244d17d08cff.tar.bz2 rails-02358c83b76f9fc56b6cabaee24b244d17d08cff.zip | |
Fix double-escaped entities, such as &amp;, &#123;, etc. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5321 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers/tag_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/tag_helper.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb index 6c71b8b767..6001b21e63 100644 --- a/actionpack/lib/action_view/helpers/tag_helper.rb +++ b/actionpack/lib/action_view/helpers/tag_helper.rb @@ -34,7 +34,7 @@ module ActionView private def tag_options(options) cleaned_options = convert_booleans(options.stringify_keys.reject {|key, value| value.nil?}) - ' ' + cleaned_options.map {|key, value| %(#{key}="#{html_escape(value.to_s)}")}.sort * ' ' unless cleaned_options.empty? + ' ' + cleaned_options.map {|key, value| %(#{key}="#{fix_double_escape(html_escape(value.to_s))}")}.sort * ' ' unless cleaned_options.empty? end def convert_booleans(options) @@ -45,6 +45,11 @@ module ActionView def boolean_attribute(options, attribute) options[attribute] ? options[attribute] = attribute : options.delete(attribute) end + + # Fix double-escaped entities, such as &amp;, &#123;, etc. + def fix_double_escape(escaped) + escaped.gsub(/&([a-z]+|(#\d+));/i) { "&#{$1};" } + end end end end |