Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #6485 from homakov/3-0-stable

auto_link sanitize output
  • Loading branch information...
commit f7cf745e8e092d0f90a06e1c75ae1701bc583045 2 parents e74e479 + 3af3385
@tenderlove tenderlove authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/lib/action_view/helpers/text_helper.rb
View
4 actionpack/lib/action_view/helpers/text_helper.rb
@@ -498,8 +498,8 @@ def auto_link_urls(text, html_options = {}, options = {})
link_text = block_given? ? yield(href) : href
href = 'http://' + href unless scheme
- sanitize = options[:sanitize] != false
- content_tag(:a, link_text, link_attributes.merge('href' => href), sanitize) + punctuation.reverse.join('')
+ sanitize_link = options[:sanitize] != false
+ sanitize(content_tag(:a, link_text, link_attributes.merge('href' => href), sanitize_link) + punctuation.reverse.join(''))
end
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.