Revert [8865], broke AP record identifier. Reopens #11109.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8874 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 5 insertions, 7 deletions

diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb
index 81ec428d34..94842f424d 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -113,8 +113,8 @@ module ActiveRecord
       end
 
       # Calculate sum using SQL, not Enumerable
-      def sum(*args)
-        calculate(:sum, *args) { |*block_args| yield(*block_args) if block_given? }
+      def sum(*args, &block)
+        calculate(:sum, *args, &block)
       end
       
       def count(*args)
@@ -128,13 +128,11 @@ module ActiveRecord
       end
 
       protected
-        def method_missing(method, *args)
+        def method_missing(method, *args, &block)
           if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method))
-            super { |*block_args| yield(*block_args) if block_given? }
+            super
           else
-            @reflection.klass.send(:with_scope, construct_scope) do
-              @reflection.klass.send(method, *args) { |*block_args| yield(*block_args) if block_given? }
-            end
+            @reflection.klass.send(:with_scope, construct_scope) { @reflection.klass.send(method, *args, &block) }
           end
         end