diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:49:15 -0500 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:49:15 -0500 |
| commit | 1767c4b2da21379862a9ab1a4316d8da6b820a2a (patch) | |
| tree | bebf99e031bc1a3408baf32c2d16bc870637b913 /actionpack/lib/action_view | |
| parent | 983dc8078708fff5d99fc31eb5eac8b532e950b3 (diff) | |
| parent | d20955f889223b6035dbc7d61acba9091bf7b7ed (diff) | |
| download | rails-1767c4b2da21379862a9ab1a4316d8da6b820a2a.tar.gz rails-1767c4b2da21379862a9ab1a4316d8da6b820a2a.tar.bz2 rails-1767c4b2da21379862a9ab1a4316d8da6b820a2a.zip | |
Merge branch 'master' of git@github.com:rails/rails
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 |