From ef89331f0a397bc88d6e27480aa7562db70550f7 Mon Sep 17 00:00:00 2001 From: Stan Lo Date: Sat, 25 Jun 2016 11:29:39 +0800 Subject: Fix ActionView::Helpers#current_page? with issue in https://github.com/rails/rails/issues/19472 --- actionview/lib/action_view/helpers/url_helper.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'actionview/lib/action_view/helpers/url_helper.rb') diff --git a/actionview/lib/action_view/helpers/url_helper.rb b/actionview/lib/action_view/helpers/url_helper.rb index 11c7daf4da..fb6426b997 100644 --- a/actionview/lib/action_view/helpers/url_helper.rb +++ b/actionview/lib/action_view/helpers/url_helper.rb @@ -548,6 +548,8 @@ module ActionView request_uri = url_string.index("?") ? 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 =~ /^\w+:\/\// url_string == "#{request.protocol}#{request.host_with_port}#{request_uri}" else -- cgit v1.2.3