diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-02-21 15:23:07 -0800 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-02-21 15:23:07 -0800 |
| commit | 349d5a686af31bc46056c040b9d41a6aa4f03203 (patch) | |
| tree | 66e30102f9769c6254497a4995e9e0dc57d7f72e | |
| parent | 19c7124c4f0b78572509b3b54d20ddcfddeb0baa (diff) | |
| parent | cd641fa96efba71efddae0c055ae2a76aaac6a43 (diff) | |
| download | rails-349d5a686af31bc46056c040b9d41a6aa4f03203.tar.gz rails-349d5a686af31bc46056c040b9d41a6aa4f03203.tar.bz2 rails-349d5a686af31bc46056c040b9d41a6aa4f03203.zip | |
Merge pull request #5118 from castlerock/ordered_options_from_hash
ordered_options will work if inherited from Hash, remove OrderedHash usage
| -rw-r--r-- | activesupport/lib/active_support/ordered_options.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/ordered_options.rb b/activesupport/lib/active_support/ordered_options.rb index 9e5a5d0246..538e41e0eb 100644 --- a/activesupport/lib/active_support/ordered_options.rb +++ b/activesupport/lib/active_support/ordered_options.rb @@ -1,5 +1,3 @@ -require 'active_support/ordered_hash' - # Usually key value pairs are handled something like this: # # h = {} @@ -17,7 +15,7 @@ require 'active_support/ordered_hash' # h.girl # => 'Mary' # module ActiveSupport #:nodoc: - class OrderedOptions < OrderedHash + class OrderedOptions < Hash alias_method :_get, :[] # preserve the original #[] method protected :_get # make it protected |