aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-02-26 14:30:19 +0100
committerYves Senn <yves.senn@gmail.com>2013-02-26 21:53:48 +0100
commit794cbf3e38a505ed8653ee3c137f65b3fc395f88 (patch)
tree760495b424aca39d91fb06a8b04be84d79347555 /actionpack/lib
parent923ec86f04ea9c55e646cba1d0d588d033252d17 (diff)
downloadrails-794cbf3e38a505ed8653ee3c137f65b3fc395f88.tar.gz
rails-794cbf3e38a505ed8653ee3c137f65b3fc395f88.tar.bz2
rails-794cbf3e38a505ed8653ee3c137f65b3fc395f88.zip
allow non-String default params in the router.
Closes #9435. Skip valid encoding checks for non-String parameters that come from the matched route's defaults.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index ff86f87d49..ca31b5e02e 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -31,6 +31,8 @@ module ActionDispatch
# If any of the path parameters has a invalid encoding then
# raise since it's likely to trigger errors further on.
params.each do |key, value|
+ next unless value.respond_to?(:valid_encoding?)
+
unless value.valid_encoding?
raise ActionController::BadRequest, "Invalid parameter: #{key} => #{value}"
end