diff options
| author | Eugene Pimenov <libc@rghost.net> | 2008-05-01 09:37:10 +0400 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-05-16 13:00:39 +0100 |
| commit | 150717344aa5c6d8f46fc67de39d6947553ac286 (patch) | |
| tree | 12523f30770c8b7d0071982f36c55d98057705d5 /actionpack | |
| parent | 3baf810482303126c75daa7915e200030d1755e0 (diff) | |
| download | rails-150717344aa5c6d8f46fc67de39d6947553ac286.tar.gz rails-150717344aa5c6d8f46fc67de39d6947553ac286.tar.bz2 rails-150717344aa5c6d8f46fc67de39d6947553ac286.zip | |
auto_link helper fails to recognize links separated by space. [#72 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/text_helper_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index 9d220c546a..55d2a68327 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -454,7 +454,7 @@ module ActionView ( # leading text <\w+.*?>| # leading HTML tag, or [^=!:'"/]| # leading punctuation, or - ^ # beginning of line + | # nothing ) ( (?:https?://)| # protocol spec, or diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb index 06e1fd1929..337697bf5c 100644 --- a/actionpack/test/template/text_helper_test.rb +++ b/actionpack/test/template/text_helper_test.rb @@ -262,6 +262,7 @@ class TextHelperTest < ActionView::TestCase assert_equal email2_result, auto_link(email2_raw) assert_equal '', auto_link(nil) assert_equal '', auto_link('') + assert_equal "#{link_result} #{link_result} #{link_result}", auto_link("#{link_raw} #{link_raw} #{link_raw}") end def test_auto_link_at_eol |