From 07392bfe879e2582fe92bd09c5ecc8f3bdb9249f Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 29 Dec 2007 05:06:06 +0000 Subject: 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 --- activerecord/lib/active_record/aggregations.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3