diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-06-20 11:37:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 11:37:48 -0400 |
| commit | 95ee77b3aeed0eb9cbac22268b398a7917e536d3 (patch) | |
| tree | b9480665600e1e592543d1d134fb44dedf201cef /actionview/lib | |
| parent | 70d3c38447eb93950d3d6d61938fe24b7fccf21f (diff) | |
| parent | 01ddd1cecff3fabd1ecaeb86717612e757b74139 (diff) | |
| download | rails-95ee77b3aeed0eb9cbac22268b398a7917e536d3.tar.gz rails-95ee77b3aeed0eb9cbac22268b398a7917e536d3.tar.bz2 rails-95ee77b3aeed0eb9cbac22268b398a7917e536d3.zip | |
Merge pull request #29503 from savroff/fix_current_page_engine_issue
Fix current_page? helper issue with engine root path
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/helpers/url_helper.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/url_helper.rb b/actionview/lib/action_view/helpers/url_helper.rb index a6857101b9..b78c367921 100644 --- a/actionview/lib/action_view/helpers/url_helper.rb +++ b/actionview/lib/action_view/helpers/url_helper.rb @@ -552,7 +552,10 @@ module ActionView request_uri = url_string.index("?") || check_parameters ? request.fullpath : request.path request_uri = URI.parser.unescape(request_uri).force_encoding(Encoding::BINARY) - url_string.chomp!("/") if url_string.start_with?("/") && url_string != "/" + if url_string.start_with?("/") && url_string != "/" + url_string.chomp!("/") + request_uri.chomp!("/") + end if %r{^\w+://}.match?(url_string) url_string == "#{request.protocol}#{request.host_with_port}#{request_uri}" |