diff options
| author | José Valim <jose.valim@gmail.com> | 2010-09-27 21:00:54 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-27 21:00:54 +0200 |
| commit | fe0251e408a8b5d1ee149c7cad7bcfc495ce1595 (patch) | |
| tree | 620f92c8485809ded3cd4081966d147efc8ad806 /activesupport | |
| parent | 6067d1620075c1c311bbae01993453cd80967804 (diff) | |
| parent | 50decfbc0e2e58961cc3665710922860d38ee2fb (diff) | |
| download | rails-fe0251e408a8b5d1ee149c7cad7bcfc495ce1595.tar.gz rails-fe0251e408a8b5d1ee149c7cad7bcfc495ce1595.tar.bz2 rails-fe0251e408a8b5d1ee149c7cad7bcfc495ce1595.zip | |
Merge remote branch 'miloops/warnings'
Conflicts:
actionpack/lib/action_controller/metal/url_for.rb
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/class/attribute.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/attribute.rb b/activesupport/lib/active_support/core_ext/class/attribute.rb index 511f26963e..5414b3a18f 100644 --- a/activesupport/lib/active_support/core_ext/class/attribute.rb +++ b/activesupport/lib/active_support/core_ext/class/attribute.rb @@ -84,6 +84,7 @@ class Class val end + remove_method :#{name} if method_defined?(:#{name}) def #{name} defined?(@#{name}) ? @#{name} : self.class.#{name} end |