diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-19 23:51:59 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-19 23:51:59 +0000 |
| commit | cf6d77600ac132fd3f840c8e57d8e139da39f675 (patch) | |
| tree | eeb791ea631ab4a7f1934fa6745d1081b5cc0b26 /actionpack/lib/action_controller/components.rb | |
| parent | 00111165929a31375b1100f9e7288391cfa7c6b4 (diff) | |
| download | rails-cf6d77600ac132fd3f840c8e57d8e139da39f675.tar.gz rails-cf6d77600ac132fd3f840c8e57d8e139da39f675.tar.bz2 rails-cf6d77600ac132fd3f840c8e57d8e139da39f675.zip | |
Tests and tweaks for components
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@706 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/components.rb')
| -rw-r--r-- | actionpack/lib/action_controller/components.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/components.rb b/actionpack/lib/action_controller/components.rb index 86bf5d8138..0d17d51ef8 100644 --- a/actionpack/lib/action_controller/components.rb +++ b/actionpack/lib/action_controller/components.rb @@ -22,7 +22,7 @@ module ActionController #:nodoc: def component_request(options) component_request = @request.dup - component_request.send(:instance_variable_set, :@parameters, options[:params].merge({ "controller" => options[:controller], "action" => options[:action] })) + component_request.send(:instance_variable_set, :@parameters, (options[:params] || {}).merge({ "controller" => options[:controller], "action" => options[:action] })) component_request end end |