Skip to content
Browse files

Fixed that UrlHelper#link_to_unless/link_to_if used html_escape on th…

…e 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
  • Loading branch information...
1 parent 34cbf15 commit 1d7aa9fe813afb1979dfefd0871d84eb60d92d39 @dhh dhh committed Jul 9, 2005
Showing with 3 additions and 1 deletion.
  1. +2 −0 actionpack/CHANGELOG
  2. +1 −1 actionpack/lib/action_view/helpers/url_helper.rb
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* 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]
+
* Added even more goodies to script.aculo.us #1677 [Thomas Fuchs]
* Added capability to remove draggables/droppables and redeclare sortables in dragdrop.js (this makes it possible to call sortable_element on the same element more than once, e.g. in AJAX returns that modify the sortable element. all current sortable 'stuff' on the element will be discarded and the sortable will be rebuilt)
* Always reset background color on Effect.Highlight; this make change backwards-compatibility, to be sure include style="background-color:(target-color)" on your elements or else elements will fall back to their CSS rules (which is a good thing in most circumstances)
View
2 actionpack/lib/action_view/helpers/url_helper.rb
@@ -143,7 +143,7 @@ def link_to_unless(condition, name, options = {}, html_options = {}, *parameters
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)

0 comments on commit 1d7aa9f

Please sign in to comment.
Something went wrong with that request. Please try again.