Ticket #4918: fix_current_page_patch.diff

test/template/url_helper_test.rb

@@ -249 +249 @@
-      link_to_unless_current("Listing", "http://www.example.com/weblog/list")
-  end
-
+  def test_current_page?
+    @controller.request = RequestMock.new("/weblog/show?a=b&c=d&e=f", 'http://', 'www.example.com')
+    assert current_page?("/weblog/show?a=b&c=d&e=f")
+    assert current_page?("http://www.example.com/weblog/show?a=b&c=d&e=f")
+    assert !current_page?("/weblog/show?a=b&e=f")
+    assert !current_page?("http://www.example.com/weblog/show?a=b&x=y")
+  end
+
-  def test_mail_to
-    assert_dom_equal "<a href=\"mailto:david@loudthinking.com\">david@loudthinking.com</a>", mail_to("david@loudthinking.com")
-    assert_dom_equal "<a href=\"mailto:david@loudthinking.com\">David Heinemeier Hansson</a>", mail_to("david@loudthinking.com", "David Heinemeier Hansson")

lib/action_view/helpers/url_helper.rb

@@ -433 +433 @@
-      #   current_page?(:controller => 'library', :action => 'checkout')
-      #   # => false
-      def current_page?(options)
-CGI.escapeHTML(url_for(options)
+url_for(options
-        request = @controller.request
+        request_uri = CGI.escapeHTML(request.request_uri)
-        if url_string =~ /^\w+:\/\//
-.request
+
-        else
-.request
+
-        end
-      end
-