diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-29 05:06:06 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-29 05:06:06 +0000 |
| commit | 07392bfe879e2582fe92bd09c5ecc8f3bdb9249f (patch) | |
| tree | e19c13b3765937bd3a24f3d061a833a59e4db05f /activerecord/lib/active_record/aggregations.rb | |
| parent | 58cf6df41ac29e59de65e4e9840868a071fc8148 (diff) | |
| download | rails-07392bfe879e2582fe92bd09c5ecc8f3bdb9249f.tar.gz rails-07392bfe879e2582fe92bd09c5ecc8f3bdb9249f.tar.bz2 rails-07392bfe879e2582fe92bd09c5ecc8f3bdb9249f.zip | |
Ruby 1.9 compat: workaround module_eval bug. Closes #10641 [Frederick Cheung]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8507 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/aggregations.rb')
| -rw-r--r-- | activerecord/lib/active_record/aggregations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/aggregations.rb b/activerecord/lib/active_record/aggregations.rb index 6fef668e1a..56c6fb9893 100644 --- a/activerecord/lib/active_record/aggregations.rb +++ b/activerecord/lib/active_record/aggregations.rb @@ -155,7 +155,7 @@ module ActiveRecord if (instance_variable_get("@#{name}").nil? || force_reload) && (!allow_nil || mapping.any? {|pair| !read_attribute(pair.first).nil? }) instance_variable_set("@#{name}", class_name.constantize.new(*mapping.collect {|pair| read_attribute(pair.first)})) end - return instance_variable_get("@#{name}") + instance_variable_get("@#{name}") end end |