From 519fe7ccbc5798aa957e9a8ea146bb825cd79b9e Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 18 Feb 2005 23:52:28 +0000 Subject: Added URL escaping for routing #664 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@670 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/routing.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index f08e23b72e..1f4d56ec01 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -41,7 +41,7 @@ module ActionController value = options[item] || defaults[item] || @defaults[item] return nil, "#{item.inspect} was not given and has no default." if value.nil? && ! (@defaults.key?(item) && @defaults[item].nil?) # Don't leave if nil value. defaults = {} unless defaults == {} || value == defaults[item] # Stop using defaults if this component isn't the same as the default. - value + (value.nil? || item == :controller) ? value : CGI.escape(value.to_s) else item end end @@ -89,7 +89,7 @@ module ActionController elsif item.kind_of? Symbol value = components.shift || @defaults[item] return nil, "No value or default for parameter #{item.inspect}" if value.nil? && ! (@defaults.key?(item) && @defaults[item].nil?) - options[item] = value + options[item] = value.nil? ? value : CGI.unescape(value) else return nil, "No value available for component #{item.inspect}" if components.empty? component = components.shift @@ -208,7 +208,7 @@ module ActionController if controller.nil? failures << [route, options] if ActionController::Base.debug_routes else - options.each {|k, v| request.path_parameters[k] = CGI.unescape(v)} + request.path_parameters = options return controller end end -- cgit v1.2.3