From dc2e3ea8c41677cdb0177a74f11a08eccc5f3554 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 19 May 2014 16:43:16 -0700 Subject: fix escaping in generation --- actionpack/lib/action_dispatch/journey/visitors.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_dispatch') diff --git a/actionpack/lib/action_dispatch/journey/visitors.rb b/actionpack/lib/action_dispatch/journey/visitors.rb index 3bee8ec5e0..616c2d26d4 100644 --- a/actionpack/lib/action_dispatch/journey/visitors.rb +++ b/actionpack/lib/action_dispatch/journey/visitors.rb @@ -144,12 +144,18 @@ module ActionDispatch node.children.map { |c| visit(c) }.join end + def visit_STAR(node) + if value = options[node.left.to_sym] + escape_path(value) + end + end + def visit_SYMBOL(node) key = node.to_sym if value = options[key] consumed[key] = value - Router::Utils.escape_path(value) + key == :controller ? escape_path(value) : escape_segment(value) else "\0" end -- cgit v1.2.3