From ddc863c13462103daa00f7ba70c8fcc8feabe3a4 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 21 Nov 2005 07:29:17 +0000 Subject: r3217@asus: jeremy | 2005-11-20 03:06:01 -0800 warnings-safe inherited alias for class_inheritable_attributes git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3129 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/lib/active_support/class_inheritable_attributes.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'activesupport/lib') diff --git a/activesupport/lib/active_support/class_inheritable_attributes.rb b/activesupport/lib/active_support/class_inheritable_attributes.rb index f9ca7af7b2..2e70a64436 100644 --- a/activesupport/lib/active_support/class_inheritable_attributes.rb +++ b/activesupport/lib/active_support/class_inheritable_attributes.rb @@ -110,8 +110,6 @@ class Class # :nodoc: child.instance_variable_set('@inheritable_attributes', inheritable_attributes.dup) end - if respond_to?(:inherited) - alias_method :inherited_without_inheritable_attributes, :inherited - end - alias_method :inherited, :inherited_with_inheritable_attributes + alias inherited_without_inheritable_attributes inherited + alias inherited inherited_with_inheritable_attributes end -- cgit v1.2.3