diff options
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 |