aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-11-21 07:29:17 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-11-21 07:29:17 +0000
commitddc863c13462103daa00f7ba70c8fcc8feabe3a4 (patch)
treeee01b015e9faef1be0598663bdb06a906b2b1af2
parent3148216cbb2fb38c9c83ab91dde96ea25d46dc7c (diff)
downloadrails-ddc863c13462103daa00f7ba70c8fcc8feabe3a4.tar.gz
rails-ddc863c13462103daa00f7ba70c8fcc8feabe3a4.tar.bz2
rails-ddc863c13462103daa00f7ba70c8fcc8feabe3a4.zip
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
-rw-r--r--activesupport/lib/active_support/class_inheritable_attributes.rb6
1 files changed, 2 insertions, 4 deletions
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