From 149f5cad856f14b53780619a3efc0258cdd4759b Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Mon, 5 Jun 2006 15:30:09 +0000 Subject: Escape the entire path before trying to recognize it (closes #3671) git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4436 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/routing.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/routing.rb') diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index e1ad27fc3a..0b8d9c0a73 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -502,7 +502,7 @@ module ActionController hangon = (default ? "|| #{default.inspect}" : "if match[#{next_capture}]") # All non code-related keys (such as :id, :slug) have to be unescaped as other CGI params - "params[:#{key}] = match[#{next_capture}] && CGI.unescape(match[#{next_capture}]) #{hangon}" + "params[:#{key}] = match[#{next_capture}] #{hangon}" end def optionality_implied? @@ -991,6 +991,7 @@ module ActionController end def recognize_path(path, environment={}) + path = CGI.unescape(path) routes.each do |route| result = route.recognize(path, environment) and return result end -- cgit v1.2.3