aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/routing_optimisation.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/routing_optimisation.rb')
-rw-r--r--actionpack/lib/action_controller/routing_optimisation.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/routing_optimisation.rb b/actionpack/lib/action_controller/routing_optimisation.rb
index 1b447b17e7..eaff1869dd 100644
--- a/actionpack/lib/action_controller/routing_optimisation.rb
+++ b/actionpack/lib/action_controller/routing_optimisation.rb
@@ -56,7 +56,6 @@ module ActionController
elements = []
idx = 0
-
if kind == :url
elements << '#{request.protocol}'
elements << '#{request.host_with_port}'
@@ -67,10 +66,10 @@ module ActionController
# we don't include the trailing slashes, so skip them.
((route.segments.size == 1 && kind == :path) ? route.segments : route.segments[0..-2]).each do |segment|
if segment.is_a?(DynamicSegment)
- elements << "\#{URI.escape(args[#{idx}].to_param, ActionController::Routing::Segment::UNSAFE_PCHAR)}"
+ elements << segment.interpolation_chunk("args[#{idx}].to_param")
idx += 1
else
- elements << segment.to_s
+ elements << segment.interpolation_chunk
end
end
%("#{elements * ''}")