aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/option_merger.rb
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-09-27 18:46:46 +0000
committerRick Olson <technoweenie@gmail.com>2006-09-27 18:46:46 +0000
commitd6925b14fa2039ba2523c69e09f2ccad15e9016f (patch)
tree419b4c35df5f84bbcc07d08587e40706519093a7 /activesupport/lib/active_support/option_merger.rb
parente537de00d806368f21cc22bde118fb90c1b6fe2d (diff)
downloadrails-d6925b14fa2039ba2523c69e09f2ccad15e9016f.tar.gz
rails-d6925b14fa2039ba2523c69e09f2ccad15e9016f.tar.bz2
rails-d6925b14fa2039ba2523c69e09f2ccad15e9016f.zip
Don't undefine #class in OptionMerger [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5197 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/option_merger.rb')
-rw-r--r--activesupport/lib/active_support/option_merger.rb2
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 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)