aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-06-17 10:01:03 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-06-24 16:15:56 -0300
commit2553bd785c0b41193257851ac0267515ec3c9dc3 (patch)
treec8bf6e9290c698d5d9e9c84ef74d66cecda2eee3 /actionpack/lib
parent119f27c519d1fbfe47fa266fde50eec47ab56aaa (diff)
downloadrails-2553bd785c0b41193257851ac0267515ec3c9dc3.tar.gz
rails-2553bd785c0b41193257851ac0267515ec3c9dc3.tar.bz2
rails-2553bd785c0b41193257851ac0267515ec3c9dc3.zip
Merge pull request #10971 from dtaniwaki/escape_link_to_unless
Always escape the result of link_to_unless method
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 812bb4de9e..51c3100dff 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -422,7 +422,7 @@ module ActionView
if block_given?
block.arity <= 1 ? capture(name, &block) : capture(name, options, html_options, &block)
else
- name
+ ERB::Util.html_escape(name)
end
else
link_to(name, options, html_options)