aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorCheah Chu Yeow <chuyeow@gmail.com>2008-06-23 21:14:49 +0800
committerPratik Naik <pratiknaik@gmail.com>2008-06-27 13:46:17 +0100
commit3c1e8ab0fecd5ee7f9328578016ef1e61214eeee (patch)
treec073104c46596ae676ad3678a5662c1daba7bb4b /actionpack/lib/action_view
parent4498aad4acda002b8f213f13c4acd52cba04d224 (diff)
downloadrails-3c1e8ab0fecd5ee7f9328578016ef1e61214eeee.tar.gz
rails-3c1e8ab0fecd5ee7f9328578016ef1e61214eeee.tar.bz2
rails-3c1e8ab0fecd5ee7f9328578016ef1e61214eeee.zip
Allow single quote (the ' character) in the middle of URL when auto_link-ing. [#471 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'actionpack/lib/action_view')
-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 d98c5bd0d5..a6c48737e9 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -468,7 +468,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
)