diff options
| author | Marcel Molina <marcel@vernix.org> | 2006-04-26 21:49:41 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2006-04-26 21:49:41 +0000 |
| commit | 71ff705449aa0cc38baa746c07d2520fdb64096a (patch) | |
| tree | a0aa21a9b6245dadf271bc38a5237524100a26cb /activesupport/lib/active_support/option_merger.rb | |
| parent | ca2eb16bf9a5844607787c49be38bd36cfbfd568 (diff) | |
| download | rails-71ff705449aa0cc38baa746c07d2520fdb64096a.tar.gz rails-71ff705449aa0cc38baa746c07d2520fdb64096a.tar.bz2 rails-71ff705449aa0cc38baa746c07d2520fdb64096a.zip | |
Allow default options in with_options to be overridden. Closes #4480. [murphy@cYcnus.de]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4282 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
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 |