Permalink
Browse files

Merge pull request #11735 from arunagw/av-warning-removed-master

Using URI.parser.unescape
  • Loading branch information...
2 parents 71f5126 + a6dab95 commit 51c61cfbc8ade02afbda319f9a61dda65dcb98ec @senny senny committed Aug 3, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionview/lib/action_view/helpers/url_helper.rb
@@ -528,13 +528,13 @@ def current_page?(options)
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}"

0 comments on commit 51c61cf

Please sign in to comment.