github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make sure passed routing options are not mutated by routing code. (closes #5314)

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4444 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jamis Buck
2006-06-07 16:27:14 +00:00
parent ae7029ddd1
commit 816d67b104
3 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
actionpack/lib/action_controller/routing.rb
View File

@@ -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
end