diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:55:29 -0500 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:55:29 -0500 |
| commit | 0994d11f26c318e63dd4189ea2dfec409132e529 (patch) | |
| tree | 885415e88c615376a7385abba887699f04b3a172 /actionpack/lib/action_view | |
| parent | c77e6ace66b34390e9c1e173c580d86e88915267 (diff) | |
| parent | 1767c4b2da21379862a9ab1a4316d8da6b820a2a (diff) | |
| download | rails-0994d11f26c318e63dd4189ea2dfec409132e529.tar.gz rails-0994d11f26c318e63dd4189ea2dfec409132e529.tar.bz2 rails-0994d11f26c318e63dd4189ea2dfec409132e529.zip | |
Merge branch 'master' into testing
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index d80e7c6e57..36f7575652 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -559,7 +559,7 @@ module ActionView (?:\.[-\w]+)* # remaining subdomains or domain (?::\d+)? # port (?:/(?:[~\w\+@%=\(\)-]|(?:[,.;:'][^\s$]))*)* # path - (?:\?[\w\+@%&=.;-]+)? # query string + (?:\?[\w\+@%&=.;:-]+)? # query string (?:\#[\w\-]*)? # trailing anchor ) ([[:punct:]]|<|$|) # trailing text @@ -598,4 +598,4 @@ module ActionView end end end -end
\ No newline at end of file +end |