0
@@ -454,7 +454,7 @@ module ActionView
0
                         (                          # leading text
0
                           <\w+.*?>|                # leading HTML tag, or
0
                           [^=!:'"/]|               # leading punctuation, or
0
-                          |                        # nothing
0
+                          ^                        # beginning of line
0
                         )
0
                         (
0
                           (?:https?://)|           # protocol spec, or
0
@@ -468,7 +468,7 @@ module ActionView
0
                           (?:\?[\w\+@%&=.;-]+)?     # query string
0
                           (?:\#[\w\-]*)?           # trailing anchor
0
                         )
0
-                        ([[:punct:]]|\s|<|$)       # trailing text
0
+                        ([[:punct:]]|<|$|)       # trailing text
0
                        }x unless const_defined?(:AUTO_LINK_RE)
0
 
0
         # Turns all urls into clickable links.  If a block is given, each url

0
@@ -264,6 +264,7 @@ class TextHelperTest < ActionView::TestCase
0
     assert_equal '', auto_link(nil)
0
     assert_equal '', auto_link('')
0
     assert_equal "#{link_result} #{link_result} #{link_result}", auto_link("#{link_raw} #{link_raw} #{link_raw}")
0
+    assert_equal '<a href="http://www.rubyonrails.com">Ruby On Rails</a>', auto_link('<a href="http://www.rubyonrails.com">Ruby On Rails</a>')
0
   end
0
 
0
   def test_auto_link_at_eol