diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2011-10-13 21:40:42 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2011-10-13 21:40:42 -0700 |
| commit | ec371606640f87289f4821f5f197709dd0ebe6f2 (patch) | |
| tree | caac5e55b06661b4c4f3f78ab3efd2296c82e71f /actionpack | |
| parent | 45ced7e1beb0d996f0471e21f0f88efaf2b26124 (diff) | |
| download | rails-ec371606640f87289f4821f5f197709dd0ebe6f2.tar.gz rails-ec371606640f87289f4821f5f197709dd0ebe6f2.tar.bz2 rails-ec371606640f87289f4821f5f197709dd0ebe6f2.zip | |
Leave escaping up to Journey
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index bc956ef216..e7bc431783 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -394,10 +394,9 @@ module ActionDispatch if name == :controller value elsif value.is_a?(Array) - value.map { |v| Journey::Router::Utils.escape_uri(v.to_param) }.join('/') - else - return nil unless param = value.to_param - param.split('/').map { |v| Journey::Router::Utils.escape_uri(v) }.join("/") + value.map { |v| v.to_param }.join('/') + elsif param = value.to_param + param end end |