diff options
| author | Brian Rose <brian@heimidal.net> | 2010-07-16 15:26:21 -0600 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-21 22:07:40 +0200 |
| commit | 622092d33e8d326217ab1ed6138e2c572c95b8ba (patch) | |
| tree | 5054692034aa1c2b39e3633c5f8b223d591af1b0 /actionpack/lib | |
| parent | d16c5cc99b4ac5a5517b643aabb3b31bf0f0f1b6 (diff) | |
| download | rails-622092d33e8d326217ab1ed6138e2c572c95b8ba.tar.gz rails-622092d33e8d326217ab1ed6138e2c572c95b8ba.tar.bz2 rails-622092d33e8d326217ab1ed6138e2c572c95b8ba.zip | |
Fixed a globbed route issue where slashes were being escaped, causing assert_routing to fail. [#5135 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 36c52eb65a..a9b97a17eb 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -414,7 +414,8 @@ module ActionDispatch elsif value.is_a?(Array) value.map { |v| Rack::Mount::Utils.escape_uri(v.to_param) }.join('/') else - Rack::Mount::Utils.escape_uri(value.to_param) + return nil unless param = value.to_param + param.split('/').map { |v| Rack::Mount::Utils.escape_uri(v) }.join("/") end end {:parameterize => parameterize} |