aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/text_helper.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-07-29 22:04:07 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-29 22:04:07 -0500
commita065b764e5beace51c2fca305d1ed5b8aa46b762 (patch)
treeceaa91034bbf30c9524e141a6b192d04eb0b2eb4 /actionpack/lib/action_view/helpers/text_helper.rb
parentfea7771d2294bd810d04c03c125ceac5d6bb9806 (diff)
downloadrails-a065b764e5beace51c2fca305d1ed5b8aa46b762.tar.gz
rails-a065b764e5beace51c2fca305d1ed5b8aa46b762.tar.bz2
rails-a065b764e5beace51c2fca305d1ed5b8aa46b762.zip
Reapply 'cab168ac' because it was accidentally patched over in '10d9fe4b'
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 3c9f7230c3..022edf23c8 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
)