aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAdam <kohnkecomm@Adam-iMac.local>2008-05-21 11:54:24 -0700
committerPratik Naik <pratiknaik@gmail.com>2008-05-22 11:16:02 +0100
commit314e556e6fb7278e37f6105fedbe5fc51f7f848a (patch)
treebd9b9a482ef5d79f46a8cc31d9e820a83bd0b867 /actionpack
parentdd9938a44ee3a7bb6c42527a1be6fcec70bf4772 (diff)
downloadrails-314e556e6fb7278e37f6105fedbe5fc51f7f848a.tar.gz
rails-314e556e6fb7278e37f6105fedbe5fc51f7f848a.tar.bz2
rails-314e556e6fb7278e37f6105fedbe5fc51f7f848a.zip
Parentheses should be acceptable characters for auto_link_urls. [#234 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/text_helper.rb2
-rw-r--r--actionpack/test/template/text_helper_test.rb1
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 55d2a68327..b710157f51 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -464,7 +464,7 @@ module ActionView
[-\w]+ # subdomain or domain
(?:\.[-\w]+)* # remaining subdomains or domain
(?::\d+)? # port
- (?:/(?:(?:[~\w\+@%=-]|(?:[,.;:][^\s$]))+)?)* # path
+ (?:/(?:(?:[~\w\+@%=\(\)-]|(?:[,.;:][^\s$]))+)?)* # path
(?:\?[\w\+@%&=.;-]+)? # query string
(?:\#[\w\-]*)? # trailing anchor
)
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index 337697bf5c..36c939f761 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -186,6 +186,7 @@ class TextHelperTest < ActionView::TestCase
http://en.wikipedia.org/wiki/Wikipedia:Today%27s_featured_picture_%28animation%29/January_20%2C_2007
http://www.mail-archive.com/rails@lists.rubyonrails.org/
http://www.amazon.com/Testing-Equal-Sign-In-Path/ref=pd_bbs_sr_1?ie=UTF8&s=books&qid=1198861734&sr=8-1
+ http://en.wikipedia.org/wiki/Sprite_(computer_graphics)
)
urls.each do |url|