Fix link_to with block

2 files changed, 2 insertions, 5 deletions

diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 14d59034f1..94f1cecade 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -206,7 +206,7 @@ module ActionView
         if block_given?
           options      = args.first || {}
           html_options = args.second
-          safe_concat(link_to(capture(&block), options, html_options))
+          link_to(capture(&block), options, html_options)
         else
           name         = args[0]
           options      = args[1] || {}
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 165cb655da..87b2e59255 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -238,10 +238,7 @@ class UrlHelperTest < ActionView::TestCase
   end
 
   def test_link_tag_using_block_in_erb
-    __in_erb_template = ''
-
-    link_to("http://example.com") { concat("Example site") }
-
+    output_buffer = link_to("http://example.com") { concat("Example site") }
     assert_equal '<a href="http://example.com">Example site</a>', output_buffer
   end