aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorStefan Kaes <skaes@gmx.net>2008-08-09 10:37:12 -0500
committerJoshua Peek <josh@joshpeek.com>2008-08-09 10:48:56 -0500
commitb2630502a0525e5965d4eff283e3d2613cd1ca19 (patch)
treec21ac6c3ca1700d74037450be4e2180d99e767de /actionpack
parent2faf35cea9846fdfa1099f5dfd1589d53a3daf3b (diff)
downloadrails-b2630502a0525e5965d4eff283e3d2613cd1ca19.tar.gz
rails-b2630502a0525e5965d4eff283e3d2613cd1ca19.tar.bz2
rails-b2630502a0525e5965d4eff283e3d2613cd1ca19.zip
Fixed autolink regexp compatibility for ruby 1.9 [#783 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'actionpack')
-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 022edf23c8..f9096d0029 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -558,7 +558,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
)