aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/text_helper.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-01-24 18:42:03 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-01-24 18:42:03 +0000
commitef1d0c1259337638983804ea0f97f25f2b3f02e4 (patch)
treea5481be7c26b33c44b390596d835afac77403491 /actionpack/lib/action_view/helpers/text_helper.rb
parent1d8cd1d744fd1e8b25aa764ddd59ef1aa100eff4 (diff)
downloadrails-ef1d0c1259337638983804ea0f97f25f2b3f02e4.tar.gz
rails-ef1d0c1259337638983804ea0f97f25f2b3f02e4.tar.bz2
rails-ef1d0c1259337638983804ea0f97f25f2b3f02e4.zip
Autolinking recognizes trailing and embedded . , : ; Closes #7354.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6034 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers/text_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/text_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 324ab54130..236e1492ac 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -369,7 +369,7 @@ module ActionView
[-\w]+ # subdomain or domain
(?:\.[-\w]+)* # remaining subdomains or domain
(?::\d+)? # port
- (?:/(?:[~\w\+%.;:-]+)?)* # path
+ (?:/(?:(?:[~\w\+%-]|(?:[,.;:][^\s$]))+)?)* # path
(?:\?[\w\+%&=.;-]+)? # query string
(?:\#[\w\-]*)? # trailing anchor
)