aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2007-02-04 18:33:54 +0000
committerRick Olson <technoweenie@gmail.com>2007-02-04 18:33:54 +0000
commit0a454cd73e9644b154d72b573bc58451010f0e1a (patch)
tree1505d18bf33a4e769c0a0c13630b43b8fb39969d /activesupport
parent334026151581caf90c1ecebec6eec3f466ebc0a7 (diff)
downloadrails-0a454cd73e9644b154d72b573bc58451010f0e1a.tar.gz
rails-0a454cd73e9644b154d72b573bc58451010f0e1a.tar.bz2
rails-0a454cd73e9644b154d72b573bc58451010f0e1a.zip
fix #write_inheritable_attribute bug that crept in
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6111 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
index d8283760b9..b39e316423 100644
--- a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
+++ b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
@@ -94,7 +94,7 @@ class Class # :nodoc:
def write_inheritable_attribute(key, value)
if inheritable_attributes.equal?(EMPTY_INHERITABLE_ATTRIBUTES)
- inheritable_attributes = {}
+ @inheritable_attributes = {}
end
inheritable_attributes[key] = value
end