From d2b6b6c452e13028e88b0f8afa0f651a93ea910b Mon Sep 17 00:00:00 2001
From: Eugene Pimenov <libc@mac.com>
Date: Sun, 7 Dec 2008 18:51:01 +0300
Subject: [PATCH] auto_link helper should not linkify URLs in the middle of a tag

---
 actionpack/lib/action_view/helpers/text_helper.rb |    5 +++--
 actionpack/test/template/text_helper_test.rb      |    6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 1d9e4fe..1a4ce92 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -536,8 +536,9 @@ module ActionView
           text.gsub(AUTO_LINK_RE) do
             href = $&
             punctuation = ''
-            # detect already linked URLs
-            if $` =~ /<a\s[^>]*href="$/
+            left,right = $`,$'
+            # detect already linked URLs and URLs in the middle of a tag
+            if left =~ /<[^>]+$/ && right =~ /^[^>]*>/
               # do not change string; URL is alreay linked
               href
             else
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index a6200fb..e70c5ee 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -352,6 +352,12 @@ class TextHelperTest < ActionView::TestCase
     assert_equal "{link: #{link3_result}}", auto_link("{link: #{link3_raw}}")
   end
 
+  def test_auto_link_in_tags
+    link_raw    = 'http://www.rubyonrails.org/images/rails.png'
+    link_result = %Q(<img src="#{link_raw}" />)
+    assert_equal link_result, auto_link(link_result)
+  end
+
   def test_auto_link_at_eol
     url1 = "http://api.rubyonrails.com/Foo.html"
     url2 = "http://www.ruby-doc.org/core/Bar.html"
-- 
1.6.0.2.g2ebc0