From 816d67b104f9ea59cd0ffaccbcc250b66b7905d0 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Wed, 7 Jun 2006 16:27:14 +0000 Subject: Make sure passed routing options are not mutated by routing code. (closes #5314) git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4444 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/routing.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 14921c3ac0..8638a1afb2 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -670,9 +670,10 @@ module ActionController # segments are passed alongside in order to distinguish between default values # and requirements. def divide_route_options(segments, options) - requirements = options.delete(:requirements) || {} - defaults = options.delete(:defaults) || {} - conditions = options.delete(:conditions) || {} + options = options.dup + requirements = (options.delete(:requirements) || {}).dup + defaults = (options.delete(:defaults) || {}).dup + conditions = (options.delete(:conditions) || {}).dup path_keys = segments.collect { |segment| segment.key if segment.respond_to?(:key) }.compact options.each do |key, value| @@ -1088,4 +1089,4 @@ module ActionController Routes = RouteSet.new end -end \ No newline at end of file +end -- cgit v1.2.3