diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-05-04 20:15:34 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-05-04 20:15:34 +0200 |
| commit | aada1a4f788490317febcb63f96ead277b9e9165 (patch) | |
| tree | 8a6f48a05483190d379b01ab15d791f325176deb /activesupport/lib | |
| parent | 47e1cca5dcceb7534cb9548d36d93b78ed1f1d81 (diff) | |
| parent | 871096d85426b49bf97c0de01850df248b7d714c (diff) | |
| download | rails-aada1a4f788490317febcb63f96ead277b9e9165.tar.gz rails-aada1a4f788490317febcb63f96ead277b9e9165.tar.bz2 rails-aada1a4f788490317febcb63f96ead277b9e9165.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/class/attribute.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/attribute.rb b/activesupport/lib/active_support/core_ext/class/attribute.rb index 5414b3a18f..7baba75ad3 100644 --- a/activesupport/lib/active_support/core_ext/class/attribute.rb +++ b/activesupport/lib/active_support/core_ext/class/attribute.rb @@ -84,7 +84,7 @@ class Class val end - remove_method :#{name} if method_defined?(:#{name}) + remove_possible_method :#{name} def #{name} defined?(@#{name}) ? @#{name} : self.class.#{name} end |