mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
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
This commit is contained in:
parent
34cbf15e72
commit
1d7aa9fe81
2 changed files with 3 additions and 1 deletions
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue