diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-08-03 07:02:50 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-08-03 07:02:50 -0700 |
| commit | 51c61cfbc8ade02afbda319f9a61dda65dcb98ec (patch) | |
| tree | 48a419e9cc12af9b0ccb2faac724a183f936dd28 | |
| parent | 71f512646a447e4b15c613d35842728e6b8dddb1 (diff) | |
| parent | a6dab95eb82b5029d94da1abb60fd3c492767645 (diff) | |
| download | rails-51c61cfbc8ade02afbda319f9a61dda65dcb98ec.tar.gz rails-51c61cfbc8ade02afbda319f9a61dda65dcb98ec.tar.bz2 rails-51c61cfbc8ade02afbda319f9a61dda65dcb98ec.zip | |
Merge pull request #11735 from arunagw/av-warning-removed-master
Using URI.parser.unescape
| -rw-r--r-- | actionview/lib/action_view/helpers/url_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/url_helper.rb b/actionview/lib/action_view/helpers/url_helper.rb index db0fb40336..1920a94567 100644 --- a/actionview/lib/action_view/helpers/url_helper.rb +++ b/actionview/lib/action_view/helpers/url_helper.rb @@ -528,13 +528,13 @@ module ActionView return false unless request.get? || request.head? - url_string = URI.unescape(url_for(options)).force_encoding(Encoding::BINARY) + url_string = URI.parser.unescape(url_for(options)).force_encoding(Encoding::BINARY) # We ignore any extra parameters in the request_uri if the # submitted url doesn't have any either. This lets the function # work with things like ?order=asc request_uri = url_string.index("?") ? request.fullpath : request.path - request_uri = URI.unescape(request_uri).force_encoding(Encoding::BINARY) + request_uri = URI.parser.unescape(request_uri).force_encoding(Encoding::BINARY) if url_string =~ /^\w+:\/\// url_string == "#{request.protocol}#{request.host_with_port}#{request_uri}" |