diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-11-29 20:43:05 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-11-29 20:43:05 +0000 |
| commit | 3da5fba56a4b01e9a4ac5aaf9b7c7c35ec2cc2f7 (patch) | |
| tree | 4414510314ec875f2b2d768f90a32126db55db96 /activerecord | |
| parent | 8df787d42890017f182c1ac6cb082317c255a456 (diff) | |
| download | rails-3da5fba56a4b01e9a4ac5aaf9b7c7c35ec2cc2f7.tar.gz rails-3da5fba56a4b01e9a4ac5aaf9b7c7c35ec2cc2f7.tar.bz2 rails-3da5fba56a4b01e9a4ac5aaf9b7c7c35ec2cc2f7.zip | |
Fix ruby 1.8 compat. const_defined? only takes a second arg on 1.9.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 8cef066608..484fe5fb16 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -459,10 +459,11 @@ module ActiveRecord #:nodoc: end def generated_feature_methods - unless const_defined?(:GeneratedFeatureMethods, false) - include const_set(:GeneratedFeatureMethods, Module.new) + @generated_feature_methods ||= begin + mod = const_set(:GeneratedFeatureMethods, Module.new) + include mod + mod end - const_get(:GeneratedFeatureMethods) end # Executes a custom SQL query against your database and returns all the results. The results will |