From d6925b14fa2039ba2523c69e09f2ccad15e9016f Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Wed, 27 Sep 2006 18:46:46 +0000 Subject: Don't undefine #class in OptionMerger [Rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5197 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/lib/active_support/option_merger.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport/lib/active_support/option_merger.rb') diff --git a/activesupport/lib/active_support/option_merger.rb b/activesupport/lib/active_support/option_merger.rb index f944729bbc..e266d156ce 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)/ + undef_method(method) if method !~ /^(__|instance_eval|class)/ end def initialize(context, options) -- cgit v1.2.3