From f71b075d6c29447d08193007936f6376779d7bff Mon Sep 17 00:00:00 2001 From: sanemat Date: Sun, 7 Jul 2013 23:14:34 +0900 Subject: Fix link_to with block and url_hash Use link_to with block and url_hash, expect block as name. But ignore block and use url_hash as name. 3-2-stable passes this test. 4-0-stable and master fail this. --- actionview/lib/action_view/helpers/url_helper.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'actionview/lib/action_view/helpers/url_helper.rb') diff --git a/actionview/lib/action_view/helpers/url_helper.rb b/actionview/lib/action_view/helpers/url_helper.rb index 19e5941971..bfd154abec 100644 --- a/actionview/lib/action_view/helpers/url_helper.rb +++ b/actionview/lib/action_view/helpers/url_helper.rb @@ -180,7 +180,11 @@ module ActionView url = url_for(options) html_options['href'] ||= url - content_tag(:a, name || url, html_options, &block) + if block_given? + content_tag(:a, capture(&block) || url, html_options) + else + content_tag(:a, name || url, html_options) + end end # Generates a form containing a single button that submits to the URL created -- cgit v1.2.3