aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-07-09 17:08:23 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-07-09 17:08:23 +0000
commit1d7aa9fe813afb1979dfefd0871d84eb60d92d39 (patch)
tree57868dfa53d30bd1d256b93cf516c489240305de /actionpack/lib/action_view
parent34cbf15e723a8d04d772f98d98c71eee5b2a05b0 (diff)
downloadrails-1d7aa9fe813afb1979dfefd0871d84eb60d92d39.tar.gz
rails-1d7aa9fe813afb1979dfefd0871d84eb60d92d39.tar.bz2
rails-1d7aa9fe813afb1979dfefd0871d84eb60d92d39.zip
Fixed that UrlHelper#link_to_unless/link_to_if used html_escape on the name if no link was to be applied. This is unnecessary and breaks its use with images #1649 [joergd@pobox.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1786 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view')
-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 43a2c96226..4864e253a8 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -143,7 +143,7 @@ module ActionView
if block_given?
block.arity <= 1 ? yield(name) : yield(name, options, html_options, *parameters_for_method_reference)
else
- html_escape(name)
+ name
end
else
link_to(name, options, html_options, *parameters_for_method_reference)