diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-14 00:34:43 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-14 00:34:43 +0000 |
| commit | 041b9b8a1c1661f90e8e586fddce981bfdb17f11 (patch) | |
| tree | ef4778f501ee2a64b47d3eb2cc60236e8266e94d /activesupport/lib/active_support/option_merger.rb | |
| parent | e6941149abbee39dbbe9898b0dc45e95046f7a70 (diff) | |
| download | rails-041b9b8a1c1661f90e8e586fddce981bfdb17f11.tar.gz rails-041b9b8a1c1661f90e8e586fddce981bfdb17f11.tar.bz2 rails-041b9b8a1c1661f90e8e586fddce981bfdb17f11.zip | |
Some 1.9 forward compatibility
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7474 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/option_merger.rb b/activesupport/lib/active_support/option_merger.rb index e266d156ce..29119d0dca 100644 --- a/activesupport/lib/active_support/option_merger.rb +++ b/activesupport/lib/active_support/option_merger.rb @@ -1,7 +1,7 @@ module ActiveSupport class OptionMerger #:nodoc: instance_methods.each do |method| - undef_method(method) if method !~ /^(__|instance_eval|class)/ + undef_method(method) if method !~ /^(__|instance_eval|class|object_id)/ end def initialize(context, options) |