diff options
Diffstat (limited to 'activesupport/lib/active_support/option_merger.rb')
| -rw-r--r-- | activesupport/lib/active_support/option_merger.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/option_merger.rb b/activesupport/lib/active_support/option_merger.rb index 51a2ea1328..f944729bbc 100644 --- a/activesupport/lib/active_support/option_merger.rb +++ b/activesupport/lib/active_support/option_merger.rb @@ -15,8 +15,8 @@ module ActiveSupport end def merge_argument_options!(arguments) - arguments << if arguments.last.respond_to? :merge! - arguments.pop.dup.merge!(@options) + arguments << if arguments.last.respond_to? :to_hash + @options.merge(arguments.pop) else @options.dup end |